diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp
index d758100a5b..41be2f8084 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp
@@ -506,12 +506,6 @@ int cellSpursLFQueueAttachLv2EventQueue()
 	return CELL_OK;
 }
 
-int cellSpursQueueDetachLv2EventQueue()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
 int _cellSpursLFQueuePopBody()
 {
 	UNIMPLEMENTED_FUNC(cellSpurs);
@@ -524,166 +518,6 @@ int cellSpursLFQueueGetTasksetAddress()
 	return CELL_OK;
 }
 
-int cellSyncLFQueueGetEntrySize()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-int cellSyncLFQueueSize()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int cellSyncLFQueueClear()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-int _cellSyncLFQueueCompletePushPointer2()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int _cellSyncLFQueueGetPopPointer2()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int cellSyncQueuePeek()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int cellSyncQueueSize()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int cellSyncQueuePop()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int _cellSyncLFQueueCompletePushPointer()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int _cellSyncLFQueueAttachLv2EventQueue()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int cellSyncQueuePush()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int cellSyncQueueTryPeek()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int _cellSyncLFQueueGetPushPointer2()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int cellSyncQueueTryPush()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int _cellSyncLFQueueGetPopPointer()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int _cellSyncLFQueueCompletePopPointer2()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int _cellSyncLFQueueDetachLv2EventQueue()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int cellSyncQueueClear()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int cellSyncQueueTryPop()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int cellSyncLFQueueInitialize()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int _cellSyncLFQueueGetSignalAddress()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int _cellSyncLFQueuePushBody()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int cellSyncLFQueueGetDirection()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int cellSyncLFQueueDepth()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int _cellSyncLFQueuePopBody()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int _cellSyncLFQueueGetPushPointer()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
-int _cellSyncLFQueueCompletePopPointer()
-{
-	UNIMPLEMENTED_FUNC(cellSpurs);
-	return CELL_OK;
-}
-
 int _cellSpursQueueInitialize()
 {
 	UNIMPLEMENTED_FUNC(cellSpurs);
@@ -708,6 +542,48 @@ int cellSpursQueueAttachLv2EventQueue()
 	return CELL_OK;
 }
 
+int cellSpursQueueDetachLv2EventQueue()
+{
+	UNIMPLEMENTED_FUNC(cellSpurs);
+	return CELL_OK;
+}
+
+int cellSpursQueueGetTasksetAddress()
+{
+	UNIMPLEMENTED_FUNC(cellSpurs);
+	return CELL_OK;
+}
+
+int cellSpursQueueClear()
+{
+	UNIMPLEMENTED_FUNC(cellSpurs);
+	return CELL_OK;
+}
+
+int cellSpursQueueDepth()
+{
+	UNIMPLEMENTED_FUNC(cellSpurs);
+	return CELL_OK;
+}
+
+int cellSpursQueueGetEntrySize()
+{
+	UNIMPLEMENTED_FUNC(cellSpurs);
+	return CELL_OK;
+}
+
+int cellSpursQueueSize()
+{
+	UNIMPLEMENTED_FUNC(cellSpurs);
+	return CELL_OK;
+}
+
+int cellSpursQueueGetDirection()
+{
+	UNIMPLEMENTED_FUNC(cellSpurs);
+	return CELL_OK;
+}
+
 int cellSpursCreateJobChainWithAttribute()
 {
 	UNIMPLEMENTED_FUNC(cellSpurs);
@@ -1123,45 +999,25 @@ void cellSpurs_init()
 	cellSpurs->AddFunc(0xd5d0b256, cellSpursJobGuardNotify);
 	cellSpurs->AddFunc(0x00af2519, cellSpursJobGuardReset);
 	
-	// Queue/LFQueue
+	// LFQueue
 	cellSpurs->AddFunc(0x011ee38b, _cellSpursLFQueueInitialize);
 	cellSpurs->AddFunc(0x8a85674d, _cellSpursLFQueuePushBody);
 	cellSpurs->AddFunc(0x1656d49f, cellSpursLFQueueAttachLv2EventQueue);
 	cellSpurs->AddFunc(0x73e06f91, cellSpursLFQueueDetachLv2EventQueue);
+	cellSpurs->AddFunc(0x35dae22b, _cellSpursLFQueuePopBody);
+	cellSpurs->AddFunc(0xb792ca1a, cellSpursLFQueueGetTasksetAddress);
+
+	// Queue
 	cellSpurs->AddFunc(0x082bfb09, _cellSpursQueueInitialize);
 	cellSpurs->AddFunc(0x91066667, cellSpursQueuePopBody);
 	cellSpurs->AddFunc(0x92cff6ed, cellSpursQueuePushBody);
 	cellSpurs->AddFunc(0xe5443be7, cellSpursQueueAttachLv2EventQueue);
 	cellSpurs->AddFunc(0x039d70b7, cellSpursQueueDetachLv2EventQueue);
-	cellSpurs->AddFunc(0x35dae22b, _cellSpursLFQueuePopBody);
-	cellSpurs->AddFunc(0xb792ca1a, cellSpursLFQueueGetTasksetAddress);
-	cellSpurs->AddFunc(0x0c7cb9f7, cellSyncLFQueueGetEntrySize);
-	cellSpurs->AddFunc(0x167ea63e, cellSyncLFQueueSize);
-	cellSpurs->AddFunc(0x2af0c515, cellSyncLFQueueClear);
-	cellSpurs->AddFunc(0x35bbdad2, _cellSyncLFQueueCompletePushPointer2);
-	cellSpurs->AddFunc(0x46356fe0, _cellSyncLFQueueGetPopPointer2);
-	cellSpurs->AddFunc(0x48154c9b, cellSyncQueuePeek);
-	cellSpurs->AddFunc(0x4da349b2, cellSyncQueueSize);
-	cellSpurs->AddFunc(0x4da6d7e0, cellSyncQueuePop);
-	cellSpurs->AddFunc(0x4e88c68d, _cellSyncLFQueueCompletePushPointer);
-	cellSpurs->AddFunc(0x54fc2032, _cellSyncLFQueueAttachLv2EventQueue);
-	cellSpurs->AddFunc(0x5ae841e5, cellSyncQueuePush);
-	cellSpurs->AddFunc(0x68af923c, cellSyncQueueTryPeek);
-	cellSpurs->AddFunc(0x6bb4ef9d,_cellSyncLFQueueGetPushPointer2);
-	cellSpurs->AddFunc(0x705985cd, cellSyncQueueTryPush);
-	cellSpurs->AddFunc(0x74c37666, _cellSyncLFQueueGetPopPointer);
-	cellSpurs->AddFunc(0x7a51deee, _cellSyncLFQueueCompletePopPointer2);
-	cellSpurs->AddFunc(0x811d148e, _cellSyncLFQueueDetachLv2EventQueue);
-	cellSpurs->AddFunc(0xa5362e73, cellSyncQueueClear);
-	cellSpurs->AddFunc(0xa58df87f, cellSyncQueueTryPop);
-	cellSpurs->AddFunc(0xaa355278, cellSyncLFQueueInitialize);
-	cellSpurs->AddFunc(0xaff7627a, _cellSyncLFQueueGetSignalAddress);
-	cellSpurs->AddFunc(0xba5961ca, _cellSyncLFQueuePushBody);
-	cellSpurs->AddFunc(0xd59aa307, cellSyncLFQueueGetDirection);
-	cellSpurs->AddFunc(0xe18c273c, cellSyncLFQueueDepth);
-	cellSpurs->AddFunc(0xe1bc7add, _cellSyncLFQueuePopBody);
-	cellSpurs->AddFunc(0xe9bf2110, _cellSyncLFQueueGetPushPointer);
-	cellSpurs->AddFunc(0xfe74e8e7, _cellSyncLFQueueCompletePopPointer);
-
+	cellSpurs->AddFunc(0x2093252b, cellSpursQueueGetTasksetAddress);
+	cellSpurs->AddFunc(0x247414d0, cellSpursQueueClear);
+	cellSpurs->AddFunc(0x35f02287, cellSpursQueueDepth);
+	cellSpurs->AddFunc(0x369fe03d, cellSpursQueueGetEntrySize);
+	cellSpurs->AddFunc(0x54876603, cellSpursQueueSize);
+	cellSpurs->AddFunc(0xec68442c, cellSpursQueueGetDirection);
 }
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
index f1ec50073e..6146a3fcc1 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
@@ -1023,6 +1023,118 @@ s32 cellSyncQueueClear(mem_ptr_t<CellSyncQueue> queue)
 	return CELL_OK;
 }
 
+int cellSyncLFQueueGetEntrySize()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+int cellSyncLFQueueSize()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int cellSyncLFQueueClear()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+int _cellSyncLFQueueCompletePushPointer2()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int _cellSyncLFQueueGetPopPointer2()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int _cellSyncLFQueueCompletePushPointer()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int _cellSyncLFQueueAttachLv2EventQueue()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int _cellSyncLFQueueGetPushPointer2()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int _cellSyncLFQueueGetPopPointer()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int _cellSyncLFQueueCompletePopPointer2()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int _cellSyncLFQueueDetachLv2EventQueue()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int cellSyncLFQueueInitialize()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int _cellSyncLFQueueGetSignalAddress()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int _cellSyncLFQueuePushBody()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int cellSyncLFQueueGetDirection()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int cellSyncLFQueueDepth()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int _cellSyncLFQueuePopBody()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int _cellSyncLFQueueGetPushPointer()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
+int _cellSyncLFQueueCompletePopPointer()
+{
+	UNIMPLEMENTED_FUNC(cellSync);
+	return CELL_OK;
+}
+
 void cellSync_init()
 {
 	cellSync->AddFunc(0xa9072dee, cellSyncMutexInitialize);
@@ -1051,4 +1163,24 @@ void cellSync_init()
 	cellSync->AddFunc(0x68af923c, cellSyncQueueTryPeek);
 	cellSync->AddFunc(0x4da349b2, cellSyncQueueSize);
 	cellSync->AddFunc(0xa5362e73, cellSyncQueueClear);
+
+	cellSync->AddFunc(0x0c7cb9f7, cellSyncLFQueueGetEntrySize);
+	cellSync->AddFunc(0x167ea63e, cellSyncLFQueueSize);
+	cellSync->AddFunc(0x2af0c515, cellSyncLFQueueClear);
+	cellSync->AddFunc(0x35bbdad2, _cellSyncLFQueueCompletePushPointer2);
+	cellSync->AddFunc(0x46356fe0, _cellSyncLFQueueGetPopPointer2);
+	cellSync->AddFunc(0x4e88c68d, _cellSyncLFQueueCompletePushPointer);
+	cellSync->AddFunc(0x54fc2032, _cellSyncLFQueueAttachLv2EventQueue);
+	cellSync->AddFunc(0x6bb4ef9d, _cellSyncLFQueueGetPushPointer2);
+	cellSync->AddFunc(0x74c37666, _cellSyncLFQueueGetPopPointer);
+	cellSync->AddFunc(0x7a51deee, _cellSyncLFQueueCompletePopPointer2);
+	cellSync->AddFunc(0x811d148e, _cellSyncLFQueueDetachLv2EventQueue);
+	cellSync->AddFunc(0xaa355278, cellSyncLFQueueInitialize);
+	cellSync->AddFunc(0xaff7627a, _cellSyncLFQueueGetSignalAddress);
+	cellSync->AddFunc(0xba5961ca, _cellSyncLFQueuePushBody);
+	cellSync->AddFunc(0xd59aa307, cellSyncLFQueueGetDirection);
+	cellSync->AddFunc(0xe18c273c, cellSyncLFQueueDepth);
+	cellSync->AddFunc(0xe1bc7add, _cellSyncLFQueuePopBody);
+	cellSync->AddFunc(0xe9bf2110, _cellSyncLFQueueGetPushPointer);
+	cellSync->AddFunc(0xfe74e8e7, _cellSyncLFQueueCompletePopPointer);
 }