Fixing some issues, that popped up after upgrading to PHP_CodeSniffer 2