Latest tweaks for the release