A few final tweaks to make sure things look right after the merge