More tweaks for composer