more composer fixes