Bug fixes for release