diff --git a/src/control/Record.cpp b/src/control/Record.cpp
index aead1720..f41bead4 100644
--- a/src/control/Record.cpp
+++ b/src/control/Record.cpp
@@ -42,7 +42,7 @@ void CRecordDataForGame::Init(void)
 	if (RecordingState == STATE_PLAYBACK) {
 		pDataBufferPointer = new uint8[MEMORY_FOR_GAME_RECORD];
 		pDataBuffer = pDataBufferPointer;
-		pDataBuffer[CFileMgr::Read(FId, (char*)pDataBufferPointer, MEMORY_FOR_GAME_RECORD) + 8] = -1;
+		pDataBuffer[CFileMgr::Read(FId, (char*)pDataBufferPointer, MEMORY_FOR_GAME_RECORD) + 8] = (uint8)-1;
 		CFileMgr::CloseFile(FId);
 	}
 #else
@@ -71,7 +71,7 @@ void CRecordDataForGame::SaveOrRetrieveDataForThisFrame(void)
 		break;
 	}
 	case STATE_PLAYBACK:
-		if (pDataBufferPointer[8] == -1)
+		if (pDataBufferPointer[8] == (uint8)-1)
 			CPad::GetPad(0)->NewState.Clear();
 		else {
 			tGameBuffer* pData = (tGameBuffer*)pDataBufferPointer;
@@ -92,7 +92,7 @@ void CRecordDataForGame::SaveOrRetrieveDataForThisFrame(void)
 
 #define PROCESS_BUTTON_STATE_STORE(buf, os, ns, field, id) \
 	do { \
-		if (os->field != os->field){ \
+		if (os->field != ns->field){ \
 			*buf++ = id; \
 			*buf++ = ns->field; \
 		} \