diff --git a/annotate_lineinfo/annotate_lineinfo.py b/annotate_lineinfo/annotate_lineinfo.py
index 277d4f4..a4d3b57 100755
--- a/annotate_lineinfo/annotate_lineinfo.py
+++ b/annotate_lineinfo/annotate_lineinfo.py
@@ -61,7 +61,7 @@ def __init__(self,binary,msdia_ver=None,sympaths=None):
             else:
                 self.dataSource.loadDataForExe(binary,';'.join(sympaths), None)
         except _ctypes.COMError as e:
-            hr = ctypes.c_uint(e[0]).value
+            hr = ctypes.c_uint(e.args[0]).value
             if hr == 0x806D0005: # E_PDB_NOT_FOUND
                 msg = "Unable to locate PDB"
             elif hr == 0x806D0012: # E_PDB_FORMAT
@@ -94,7 +94,7 @@ def iter_function_lineinfo(self):
             for line in self.iter_lineinfo_by_rva(func.relativeVirtualAddress, func.length):
                 self.logger.debug("[{:08X}-{:08X}] {}:{}:{}".format(
                     line.relativeVirtualAddress, line.relativeVirtualAddress+line.length,
-                    compiland_name(line.compiland), func.name, line.lineNumber))
+                    line.sourceFile.fileName, func.name, line.lineNumber))
                 yield func,line
 
 def main(argv):
@@ -171,7 +171,7 @@ def ida_get_sympath():
 
     def ida_add_lineinfo_comment(line, func=None):
         ea = idaapi.get_imagebase()+line.relativeVirtualAddress
-        cmt = "{}".format(compiland_name(line.compiland))
+        cmt = "{}".format(line.sourceFile.fileName)
         if func is not None:
             cmt += ":{}".format(func.name)
         cmt += ":{}".format(line.lineNumber)