Composer Fixes

This is a follow up to my changes to octobercms/library.