More composer fixes
Merging. Fix conflicts.