Fix some post-launch oversights