diff --git a/jedi/api_classes.py b/jedi/api_classes.py
index 45e798e6..5d5b7614 100644
--- a/jedi/api_classes.py
+++ b/jedi/api_classes.py
@@ -16,7 +16,8 @@ class BaseOutput(object):
                'os2emxpath': 'os.path',
                'macpath': 'os.path',
                'genericpath': 'os.path',
-               '_io': 'io'
+               '_io': 'io',
+               '__builtin__': '',
                }
 
     _tuple_mapping = dict((tuple(k.split('.')), v) for (k, v) in {
@@ -101,7 +102,7 @@ class BaseOutput(object):
             if tuple(path[:len(key)]) == key:
                 path = [repl] + path[len(key):]
 
-        return '.'.join(path)
+        return '.'.join(path if path[0] else path[1:])
 
     def __repr__(self):
         return "<%s %s>" % (type(self).__name__, self.description)