Fix a few PhpStorm inspector warnings