Merge "Fix some PHPCS issues"