Consistency fixes

Spotted by Shirayuki.

Change-Id: I0e016caacaa7c1f00c966cc50eaa2f6982085e5b