other composer fixes