Couple fixes that should never have needed doing