Tweaks after merge