Fix some small import issues and typos.