Minor fixes for PHPStorm and ApiGen warnings.