Tweaks to prepare for Laravel 5