Some laravel 5 fixes