Update composer
Misc changes