A load of composer fixes