Minor composer changes