More composer fixes