Fix covers and use