diff --git a/reapi/src/natives/natives_hookmessage.cpp b/reapi/src/natives/natives_hookmessage.cpp
index ce8dba57..0d52e306 100644
--- a/reapi/src/natives/natives_hookmessage.cpp
+++ b/reapi/src/natives/natives_hookmessage.cpp
@@ -1,6 +1,6 @@
 #include "precompiled.h"
 
-#define CHECK_PARAMBOUNDS(x, y) if (unlikely(x > (size_t)y)) { AMXX_LogError(amx, AMX_ERR_NATIVE, "%s: invalid message argument %d/max:%d", __FUNCTION__, x, y); }
+#define CHECK_PARAMBOUNDS(x, y) if (unlikely(x > (size_t)y)) { AMXX_LogError(amx, AMX_ERR_NATIVE, "%s: invalid message argument %d/max:%d", __FUNCTION__, x, y); return FALSE; }
 
 enum MessageHook
 {
@@ -320,7 +320,7 @@ cell AMX_NATIVE_CALL GetMessageOrigData(AMX *amx, cell *params)
 	case IMessage::DataType::Dest:
 		return static_cast<cell>(g_activeMessageContext->getOriginalDest());
 	case IMessage::DataType::Index:
-		return g_activeMessageContext->getId();
+		return g_activeMessageContext->getOriginalId();
 	case IMessage::DataType::Origin:
 		*(Vector *)getAmxAddr(amx, params[arg_value]) = g_activeMessageContext->getOriginalOrigin();
 		return TRUE;
diff --git a/reapi/src/natives/natives_members.cpp b/reapi/src/natives/natives_members.cpp
index 368570e2..0ab79f98 100644
--- a/reapi/src/natives/natives_members.cpp
+++ b/reapi/src/natives/natives_members.cpp
@@ -765,7 +765,7 @@ cell AMX_NATIVE_CALL set_netadr(AMX *amx, cell *params)
 		adr->port = ntohs(params[arg_value] & 0xFFFF); // cap short
 		break;
 	case netadr_ip:
-		*(size_t *)adr->ip = htonl(params[arg_value] & 0xFFFFFFFF); // cap int
+		*(unsigned int *)adr->ip = htonl(params[arg_value] & 0xFFFFFFFF); // cap int
 		break;
 	default:
 		return FALSE;
@@ -812,7 +812,7 @@ cell AMX_NATIVE_CALL get_netadr(AMX *amx, cell *params)
 			setAmxString(dest, NET_AdrToString(*adr, true /*no port*/), length);
 		}
 
-		return htonl(*(size_t *)adr->ip);
+		return htonl(*(unsigned int *)adr->ip);
 	}
 	default:
 		break;