Quick pre-release tweaks