A load of fixes