Fix ApiGen errors
Merge pull request #2792 from rockingeric/fixer

Fix ApiGen errors