Further code coverage tweaks