Bugfixes to composer install