Repair some odd things