Minor composer related changes