Fixes for Laravel 5