Code coverage tweaks

Few things I found unplesant.