diff --git a/jedi/api/usages.py b/jedi/api/usages.py
index 91c65e4e..a109c7bc 100644
--- a/jedi/api/usages.py
+++ b/jedi/api/usages.py
@@ -69,6 +69,9 @@ def usages(evaluator, definition_names, mods):
             result = evaluator.goto(name)
             if [c for c in compare_array(result) if c in compare_definitions]:
                 definitions.append(classes.Definition(evaluator, name))
+                # Previous definitions might be imports, so include them
+                # (because goto might return that import name).
+                compare_definitions += compare_array([name])
 
             continue  # TODO DELETE
 
@@ -101,5 +104,5 @@ def usages_add_import_modules(evaluator, definitions):
         imp_or_stmt = d.get_definition()
         if isinstance(imp_or_stmt, pr.Import):
             s = imports.ImportWrapper(evaluator, d)
-            new |= s.follow(is_goto=True)
+            new |= set(s.follow(is_goto=True))
     return set(definitions) | new
diff --git a/jedi/parser/tree.py b/jedi/parser/tree.py
index 979407dc..ff627d0b 100644
--- a/jedi/parser/tree.py
+++ b/jedi/parser/tree.py
@@ -399,7 +399,7 @@ class Simple(Base):
     def name_for_position(self, position):
         for c in self.children:
             if isinstance(c, Leaf):
-                if c.start_pos <= position <= c.end_pos:
+                if isinstance(c, Name) and c.start_pos <= position <= c.end_pos:
                     return c
             else:
                 result = c.name_for_position(position)