Updates from PHPStorm code analysis