a few bug fixes for release