Composer preparations: general code tweaks