Fixed missing and unused imports.