diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 8442c698..628fcfbf 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -30,7 +30,7 @@
 
 #include <stdio.h>
 
-DECOMP_SIZE_ASSERT(LegoGameState::Username, 0xe)
+DECOMP_SIZE_ASSERT(LegoGameState::Username, 0x0e)
 DECOMP_SIZE_ASSERT(LegoGameState::ScoreItem, 0x2c)
 DECOMP_SIZE_ASSERT(LegoGameState::History, 0x374)
 DECOMP_SIZE_ASSERT(LegoGameState, 0x430)
diff --git a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
index 1de199ee..3031b9e3 100644
--- a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
@@ -46,14 +46,10 @@ RegistrationBook::~RegistrationBook()
 {
 	for (MxS16 i = 0; i < 10; i++) {
 		for (MxS16 j = 0; j < 7; j++) {
-			MxStillPresenter* presenter = m_name[i][j];
-			if (presenter != NULL) {
-				if (presenter->GetAction() != NULL) {
-					delete presenter->GetAction();
-				}
-
-				delete presenter;
-				presenter = NULL;
+			if (m_name[i][j] != NULL) {
+				delete m_name[i][j]->GetAction();
+				delete m_name[i][j];
+				m_name[i][j] = NULL;
 			}
 		}
 	}
@@ -130,9 +126,11 @@ MxLong RegistrationBook::HandleEndAction(MxEndActionNotificationParam& p_param)
 	if (p_param.GetAction()->GetAtomId() != m_atom) {
 		return 0;
 	}
-	switch ((MxS16) p_param.GetAction()->GetObjectId()) {
+
+	switch ((MxS32) p_param.GetAction()->GetObjectId()) {
 	case RegbookScript::c_Textures:
 		m_unk0x2c1 = 0;
+
 		if (m_unk0x2b8 == 0) {
 			TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
 		}
@@ -144,6 +142,7 @@ MxLong RegistrationBook::HandleEndAction(MxEndActionNotificationParam& p_param)
 		m_unk0xf8 = Timer()->GetTime();
 		break;
 	}
+
 	return 1;
 }