A few coverage tweaks