More coverage fixes