Fixes from SensioLabs PHP Coding Standards Fixer