bug fixes (from code coverage tests)