Last round of fixes for release