Small fixes for release