Fix import-related errors.