Changes needed after UV tests