Minor composer fixes