Fix: issues identified by PHP Analyzer