diff --git a/src/box/sophia_index.h b/src/box/sophia_index.h
index 166235e496fa87acb07a987d2d5c9b3e74dbe346..d426171bcb6910ae4cecdfd830ff1c02bec48a15 100644
--- a/src/box/sophia_index.h
+++ b/src/box/sophia_index.h
@@ -46,7 +46,7 @@ class SophiaIndex: public Index {
 	findByKey(const char *key, uint32_t) const override;
 
 	virtual struct iterator*
-	allocIterator() const;
+	allocIterator() const override;
 
 	virtual void
 	initIterator(struct iterator *iterator,
diff --git a/src/box/wal.cc b/src/box/wal.cc
index 37d23ad7315550d149cf33f0685350959f5da647..89a2a12ebfab28e5354e9270c15ba8d80835726f 100644
--- a/src/box/wal.cc
+++ b/src/box/wal.cc
@@ -131,8 +131,8 @@ static void
 tx_schedule_commit(struct cmsg *msg);
 
 static struct cmsg_hop wal_request_route[] = {
-	wal_write_to_disk, &wal_writer_singleton.tx_pipe,
-	tx_schedule_commit, NULL,
+	{wal_write_to_disk, &wal_writer_singleton.tx_pipe},
+	{tx_schedule_commit, NULL},
 };
 
 static void
@@ -318,7 +318,9 @@ wal_writer_stop()
 
 	/* Stop the worker thread. */
 	struct cmsg wakeup;
-	struct cmsg_hop route[1] = { wal_writer_stop_f, NULL };
+	struct cmsg_hop route[1] = {
+		{wal_writer_stop_f, NULL}
+	};
 	cmsg_init(&wakeup, route);
 
 	cpipe_push(&writer->wal_pipe, &wakeup);
@@ -375,8 +377,8 @@ int64_t
 wal_checkpoint(struct wal_writer *writer, struct vclock *vclock)
 {
 	static struct cmsg_hop wal_checkpoint_route[] = {
-		wal_checkpoint_f, &wal_writer_singleton.tx_pipe,
-		wal_checkpoint_done_f, NULL,
+		{wal_checkpoint_f, &wal_writer_singleton.tx_pipe},
+		{wal_checkpoint_done_f, NULL},
 	};
 	vclock_create(vclock);
 	struct wal_checkpoint msg;