Final fixes for release