Some additional merge fixes
Updated for new laravel config