diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 33d1a50e..1f3ec51c 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -537,6 +537,7 @@ class BaseDocument(object):
         DynamicEmbeddedDocument = _import_class("DynamicEmbeddedDocument")
         ReferenceField = _import_class("ReferenceField")
         SortedListField = _import_class("SortedListField")
+
         changed_fields = []
         changed_fields += getattr(self, '_changed_fields', [])
 
diff --git a/mongoengine/queryset/__init__.py b/mongoengine/queryset/__init__.py
index 40aa1cc7..483e847e 100644
--- a/mongoengine/queryset/__init__.py
+++ b/mongoengine/queryset/__init__.py
@@ -1,10 +1,10 @@
 from mongoengine.errors import (DoesNotExist, InvalidQueryError,
                                 MultipleObjectsReturned, NotUniqueError,
                                 OperationError)
+from mongoengine.queryset.base import CASCADE, DENY, DO_NOTHING, NULLIFY, PULL
 from mongoengine.queryset.field_list import QueryFieldList
 from mongoengine.queryset.manager import QuerySetManager, queryset_manager
-from mongoengine.queryset.queryset import (CASCADE, DENY, DO_NOTHING, NULLIFY,
-                                           PULL, QuerySet, QuerySetNoCache)
+from mongoengine.queryset.queryset import QuerySet, QuerySetNoCache
 from mongoengine.queryset.visitor import Q
 
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 051081ef..0ddac361 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1741,7 +1741,7 @@ class BaseQuerySet(object):
                     # If we need to coerce types, we need to determine the
                     # type of this field and use the corresponding
                     # .to_python(...)
-                    from mongoengine.fields import EmbeddedDocumentField
+                    EmbeddedDocumentField = _import_class('EmbeddedDocumentField')
 
                     obj = self._document
                     for chunk in path.split('.'):