More UV fixes