diff --git a/src/rsrv/camessage.c b/src/rsrv/camessage.c
index 7b88b5fd4..047a1f1c5 100644
--- a/src/rsrv/camessage.c
+++ b/src/rsrv/camessage.c
@@ -1490,7 +1490,7 @@ db_field_log		*pfl
 		 * assert() is safe here because the type was
 		 * checked by db_get_field()
 		 */
-		assert (mp->m_type < NELEMENTS(cac_dbr_cvrt));
+		assert (pevext->msg.m_type < NELEMENTS(cac_dbr_cvrt));
 
 		/* use type as index into conversion jumptable */
 		(* cac_dbr_cvrt[pevext->msg.m_type])
diff --git a/src/rsrv/online_notify.c b/src/rsrv/online_notify.c
index f92bb8354..593e5b0cd 100644
--- a/src/rsrv/online_notify.c
+++ b/src/rsrv/online_notify.c
@@ -138,7 +138,8 @@ int rsrv_online_notify_task()
 		abort();
 
    	bfill((char *)&msg, sizeof msg, 0);
-	msg.m_cmmd = htons(CA_PROTO_RSRV_IS_UP);
+	msg.m_cmmd = htons (CA_PROTO_RSRV_IS_UP);
+	msg.m_count = htons (ca_server_port);
 
 	ellInit(&beaconAddrList);