Environment/Composer install fixes