Laravel 5 compatibility fixes