Fix problems found by