Pre-release tweaks