Minor fixes for PHPStorm warnings.