Last fixes for the release