Coverage rendring fixes