Fixing PhpStorm issues