[MASTER] Composer Fixes