Composer Fixes