Some fixes to wrap up the release