Minor fixes to increase coverage