Fix small tweaks after merge.