A bit more coverage improvement, fix resulting test failures