More fixes for release