misc fixes for release