bug fixes for release