PHPStorm fixes