some fixes on code coverage