Various fixes relating to previous cleanuo