diff --git a/daemon/peer.c b/daemon/peer.c
index be6eafc50..492835422 100644
--- a/daemon/peer.c
+++ b/daemon/peer.c
@@ -1469,15 +1469,15 @@ static bool normal_pkt_in(struct peer *peer, const Pkt *pkt)
 	       || peer->state == STATE_NORMAL_COMMITTING);
 
 	switch (pkt->pkt_case) {
-	case PKT_UPDATE_ADD_HTLC:
+	case PKT__PKT_UPDATE_ADD_HTLC:
 		err = handle_pkt_htlc_add(peer, pkt);
 		break;
 		
-	case PKT_UPDATE_FULFILL_HTLC:
+	case PKT__PKT_UPDATE_FULFILL_HTLC:
 		err = handle_pkt_htlc_fulfill(peer, pkt);
 		break;
 
-	case PKT_UPDATE_FAIL_HTLC:
+	case PKT__PKT_UPDATE_FAIL_HTLC:
 		err = handle_pkt_htlc_fail(peer, pkt);
 		break;
 
@@ -1485,11 +1485,11 @@ static bool normal_pkt_in(struct peer *peer, const Pkt *pkt)
 		err = handle_pkt_feechange(peer, pkt);
 		break;
 
-	case PKT_UPDATE_COMMIT:
+	case PKT__PKT_UPDATE_COMMIT:
 		err = handle_pkt_commit(peer, pkt);
 		break;
 
-	case PKT_CLOSE_SHUTDOWN:
+	case PKT__PKT_CLOSE_SHUTDOWN:
 		err = accept_pkt_close_shutdown(peer, pkt);
 		if (err)
 			break;
@@ -1499,7 +1499,7 @@ static bool normal_pkt_in(struct peer *peer, const Pkt *pkt)
 		}
 		return true;
 
-	case PKT_UPDATE_REVOCATION:
+	case PKT__PKT_UPDATE_REVOCATION:
 		if (peer->state == STATE_NORMAL_COMMITTING) {
 			err = handle_pkt_revocation(peer, pkt, STATE_NORMAL);
 			if (!err)
diff --git a/daemon/sphinx.c b/daemon/sphinx.c
index c2846c98b..9ad7fdcbc 100644
--- a/daemon/sphinx.c
+++ b/daemon/sphinx.c
@@ -110,9 +110,9 @@ static struct hoppayload *parse_hoppayload(const tal_t *ctx, u8 *src)
 	int p = 0;
 	struct hoppayload *result = talz(ctx, struct hoppayload);
 
-	read_buffer(&result->realm, src, sizeof(&result->realm), &p);
-	read_buffer(&result->amount, src, sizeof(&result->amount), &p);
-	read_buffer(&result->remainder, src, sizeof(&result->remainder), &p);
+	read_buffer(&result->realm, src, sizeof(result->realm), &p);
+	read_buffer(&result->amount, src, sizeof(result->amount), &p);
+	read_buffer(&result->remainder, src, sizeof(result->remainder), &p);
 	return result;
 }
 
@@ -120,9 +120,9 @@ static void serialize_hoppayload(u8 *dst, struct hoppayload *hp)
 {
 	int p = 0;
 
-	write_buffer(dst, &hp->realm, sizeof(&hp->realm), &p);
-	write_buffer(dst, &hp->amount, sizeof(&hp->amount), &p);
-	write_buffer(dst, &hp->remainder, sizeof(&hp->remainder), &p);
+	write_buffer(dst, &hp->realm, sizeof(hp->realm), &p);
+	write_buffer(dst, &hp->amount, sizeof(hp->amount), &p);
+	write_buffer(dst, &hp->remainder, sizeof(hp->remainder), &p);
 }
 
 
@@ -518,7 +518,7 @@ struct route_step *process_onionpacket(
 	stream_decrypt(step->next->payload, msg->payload, sizeof(msg->payload), keys.pi);
 	memcpy(&step->next->routinginfo, paddedheader + 2 * SECURITY_PARAMETER, ROUTING_INFO_SIZE);
 
-	if (memeqzero(step->next->mac, sizeof(&step->next->mac))) {
+	if (memeqzero(step->next->mac, sizeof(step->next->mac))) {
 		step->nextcase = ONION_END;
 	} else {
 		step->nextcase = ONION_FORWARD;