Fix some more cleaning and validation issues