Fixes to add code coverage