Fix minor typos.
Fix IDE automatic imports.
Merge pull request #1112 from mtbc/fix-auto-imports

Fix IDE auto-import entries. (rebase)