Remove remaining UV bugs (hopefully)