Small fixes to increase coverage correctly