diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c
index 64bbeccff..68f4a36ee 100644
--- a/lightningd/peer_control.c
+++ b/lightningd/peer_control.c
@@ -1783,6 +1783,7 @@ void peer_last_tx(struct peer *peer, struct bitcoin_tx *tx,
 	peer->last_tx = tal_steal(peer, tx);
 }
 
+/* FIXME: Guard with heavy dev-only #ifdefs! */
 static void json_sign_last_tx(struct command *cmd,
 			      const char *buffer, const jsmntok_t *params)
 {
diff --git a/lightningd/subd.c b/lightningd/subd.c
index 8819dad27..81e508b53 100644
--- a/lightningd/subd.c
+++ b/lightningd/subd.c
@@ -551,6 +551,8 @@ struct subd *new_subd(const tal_t *ctx,
 
 void subd_send_msg(struct subd *sd, const u8 *msg_out)
 {
+	/* FIXME: We should use unique upper bits for each daemon, then
+	 * have generate-wire.py add them, just assert here. */
 	assert(!strstarts(sd->msgname(fromwire_peektype(msg_out)), "INVALID"));
 	msg_enqueue(&sd->outq, msg_out);
 }