PhpStorm bug fixes