Minor coverage improvements