Bugfixes due to PHP Analyzer