Fixing broken stuff due to Laravel framework updates