Fixed laravel upgrade issues