Laravel upgrade
Tweaks