Switched to Laravel 4.0, some fixes