More pre-release tweaks