+ Fix unused imports, typo, and missing imports.