Fixing 4.2 Laravel issues