Some composer fixes