Ordinary post-merge fixes