Composer tweaks