Remaining composer changes