Fix import errors and typos