More fixes for release...