Fix minor import issues.