Fixes to composer.json and setup.sh