Fix some PHPAnalyzer issues