Last fixes for release