Fix broken import statements and typos