additional bug fixes for last release