Some coverage fixes