More PHPStorm fixes