Composer preparation - further tweaks