More composer fixes
Merge pull request #3632 from GrahamCampbell/4.1-composer

More Composer Fixes