Fixes for release