diff --git a/Minecraft.Client/Extrax64Stubs.cpp b/Minecraft.Client/Extrax64Stubs.cpp
index 6a3374ff..f254beb6 100644
--- a/Minecraft.Client/Extrax64Stubs.cpp
+++ b/Minecraft.Client/Extrax64Stubs.cpp
@@ -34,10 +34,6 @@
 #include <perf.h>
 #endif
 
-#ifdef _WINDOWS64
-wchar_t	fakeGamerTagW[32] = L"PlayerName";
-#endif
-
 CSentientManager SentientManager;
 CXuiStringTable StringTable;
 
@@ -195,11 +191,7 @@ bool IQNetPlayer::IsHost() { return this == &IQNet::m_player[0]; }
 bool IQNetPlayer::IsGuest() { return false; }
 bool IQNetPlayer::IsLocal() { return true; }
 PlayerUID IQNetPlayer::GetXuid() { return INVALID_XUID; }
-#ifdef _WINDOWS64
-LPCWSTR IQNetPlayer::GetGamertag() { return fakeGamerTagW; }
-#else
 LPCWSTR IQNetPlayer::GetGamertag() { return L"stub"; }
-#endif
 int IQNetPlayer::GetSessionIndex() { return 0; }
 bool IQNetPlayer::IsTalking() { return false; }
 bool IQNetPlayer::IsMutedByLocalUser(DWORD dwUserIndex) { return false; }
@@ -384,7 +376,6 @@ DWORD XEnableGuestSignin(BOOL fEnable) { return 0; }
 /////////////////////////////////////////////// Profile library
 #ifdef _WINDOWS64
 static void *profileData[4];
-static bool s_bProfileIsFullVersion;
 void				C_4JProfile::Initialise( DWORD dwTitleID,
 								DWORD dwOfferID,
 								unsigned short usProfileVersion,
@@ -454,9 +445,6 @@ void				C_4JProfile::SetTrialTextStringTable(CXuiStringTable *pStringTable,int i
 void				C_4JProfile::SetTrialAwardText(eAwardType AwardType,int iTitle,int iText) {}
 int					C_4JProfile::GetLockedProfile() { return 0; }
 void				C_4JProfile::SetLockedProfile(int iProf) {}
-bool				C_4JProfile::IsSignedIn(int iQuadrant) { return ( iQuadrant == 0); }
-bool				C_4JProfile::IsSignedInLive(int iProf) { return true; }
-bool				C_4JProfile::IsGuest(int iQuadrant) { return false; }
 UINT				C_4JProfile::RequestSignInUI(bool bFromInvite,bool bLocalGame,bool bNoGuestsAllowed,bool bMultiplayerSignIn,bool bAddUser, int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant) { return 0; }
 UINT				C_4JProfile::DisplayOfflineProfile(int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant)  { return 0; }
 UINT				C_4JProfile::RequestConvertOfflineToGuestUI(int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant) { return 0; }
@@ -465,7 +453,6 @@ bool				C_4JProfile::QuerySigninStatus(void) { return true; }
 void				C_4JProfile::GetXUID(int iPad, PlayerUID *pXuid,bool bOnlineXuid) {*pXuid = 0xe000d45248242f2e; }
 BOOL				C_4JProfile::AreXUIDSEqual(PlayerUID xuid1,PlayerUID xuid2) { return false; }
 BOOL				C_4JProfile::XUIDIsGuest(PlayerUID xuid) { return false; }
-bool				C_4JProfile::AllowedToPlayMultiplayer(int iProf) { return true; }
 
 #if defined(__ORBIS__)
 bool				C_4JProfile::GetChatAndContentRestrictions(int iPad, bool thisQuadrantOnly, bool *pbChatRestricted,bool *pbContentRestricted,int *piAge)
@@ -482,28 +469,20 @@ void				C_4JProfile::AllowedPlayerCreatedContent(int iPad, bool thisQuadrantOnly
 BOOL				C_4JProfile::CanViewPlayerCreatedContent(int iPad, bool thisQuadrantOnly, PPlayerUID pXuids, DWORD dwXuidCount ) { return true; }
 bool				C_4JProfile::GetProfileAvatar(int iPad,int( *Func)(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes), LPVOID lpParam) { return false; }
 void				C_4JProfile::CancelProfileAvatarRequest() {}
-int					C_4JProfile::GetPrimaryPad() { return 0; }
-void				C_4JProfile::SetPrimaryPad(int iPad) {}
-char				fakeGamerTag[32] = "PlayerName";
 #ifdef _DURANGO
 void				SetFakeGamertag(char *name){ strcpy_s(fakeGamerTag, name); }
 char*				C_4JProfile::GetGamertag(int iPad){ return fakeGamerTag; }
 #elif _WINDOWS64
-void				CConsoleMinecraftApp::SetFakeGamertag(char *name){ strcpy_s(fakeGamerTag, name); size_t chars = 0; mbstowcs_s(&chars, fakeGamerTagW, 32, name, _TRUNCATE); }
-char*				C_4JProfile::GetGamertag(int iPad){ return fakeGamerTag; }
-wstring				C_4JProfile::GetDisplayName(int iPad){ return fakeGamerTagW; }
+void				CConsoleMinecraftApp::SetFakeGamertag(char *name){ ProfileManager.SetFakeGamerTag(name); }
 #else //str1k3r - every other platform BUT Windows64 and Durango
 void				SetFakeGamertag(char *name){ strcpy_s(fakeGamerTag, name); size_t chars = 0; }
 char*				C_4JProfile::GetGamertag(int iPad){ return fakeGamerTag; }
 wstring				C_4JProfile::GetDisplayName(int iPad){ return L"PlayerName"; }
 #endif
-bool				C_4JProfile::IsFullVersion() { return s_bProfileIsFullVersion; }
 void				C_4JProfile::SetSignInChangeCallback(void ( *Func)(LPVOID, bool, unsigned int),LPVOID lpParam) {}
 void				C_4JProfile::SetNotificationsCallback(void ( *Func)(LPVOID, DWORD, unsigned int),LPVOID lpParam) {}
 bool				C_4JProfile::RegionIsNorthAmerica(void) { return false; }
 bool				C_4JProfile::LocaleIsUSorCanada(void) { return false; }
-HRESULT				C_4JProfile::GetLiveConnectionStatus() { return S_OK; }
-bool				C_4JProfile::IsSystemUIDisplayed() { return false; }
 void				C_4JProfile::SetProfileReadErrorCallback(void ( *Func)(LPVOID), LPVOID lpParam) {}
 int( *defaultOptionsCallback)(LPVOID,C_4JProfile::PROFILESETTINGS *, const int iPad) = NULL;
 LPVOID lpProfileParam = NULL;
@@ -544,7 +523,6 @@ void				C_4JProfile::SetRichPresenceContextValue(int iPad,int iContextID, int iV
 void				C_4JProfile::SetCurrentGameActivity(int iPad,int iNewPresence, bool bSetOthersToIdle) {}
 void				C_4JProfile::DisplayFullVersionPurchase(bool bRequired, int iQuadrant, int iUpsellParam) {}
 void				C_4JProfile::SetUpsellCallback(void ( *Func)(LPVOID lpParam, eUpsellType type, eUpsellResponse response, int iUserData),LPVOID lpParam) {}
-void				C_4JProfile::SetDebugFullOverride(bool bVal) {s_bProfileIsFullVersion = bVal;}
 void				C_4JProfile::ShowProfileCard(int iPad, PlayerUID targetUid) {}
 
 /////////////////////////////////////////////// Storage library
@@ -661,4 +639,6 @@ void StatsCounter::WipeLeaderboards() {}
 
 #ifdef __PS3__
 bool				C_4JProfile::IsFullVersion() { return true; }
-#endif
\ No newline at end of file
+#endif
+
+C_4JProfile ProfileManager;
\ No newline at end of file
diff --git a/Minecraft.Client/Windows64/4JLibs b/Minecraft.Client/Windows64/4JLibs
index e1fd0276..0a87b227 160000
--- a/Minecraft.Client/Windows64/4JLibs
+++ b/Minecraft.Client/Windows64/4JLibs
@@ -1 +1 @@
-Subproject commit e1fd02765addc9ad8793faf059670df16c45b206
+Subproject commit 0a87b227d3e1703f74c0fd45ab38904c06109d25
diff --git a/Minecraft.World/Redstone.cpp b/Minecraft.World/Redstone.cpp
index 66aa6b2f..3f11187b 100644
--- a/Minecraft.World/Redstone.cpp
+++ b/Minecraft.World/Redstone.cpp
@@ -2,7 +2,9 @@
 
 #include "Redstone.h"
 
+#ifdef __ORBIS__
 // 4J-JEV: Because whiny Ps4 compiler.
 const int Redstone::SIGNAL_NONE;
 const int Redstone::SIGNAL_MIN;
-const int Redstone::SIGNAL_MAX;
\ No newline at end of file
+const int Redstone::SIGNAL_MAX;
+#endif
\ No newline at end of file