Composer related fixes