diff --git a/Version Control.accda.src/modules/clsDevMode.cls b/Version Control.accda.src/modules/clsDevMode.cls
index f51e763a..d1438712 100644
--- a/Version Control.accda.src/modules/clsDevMode.cls	
+++ b/Version Control.accda.src/modules/clsDevMode.cls	
@@ -240,7 +240,7 @@ Public Sub LoadFromExportFile(strFileContent As String)
     ' Clear existing structures and create block classes.
     ClearStructures
 
-    If Not Len(strFileContent) Then Exit Sub
+    If Len(strFileContent) = 0 Then Exit Sub
 
     ' Read the text file line by line, loading the block data
     Perf.OperationStart "Read File DevMode"
diff --git a/Version Control.accda.src/modules/clsSourceParser.cls b/Version Control.accda.src/modules/clsSourceParser.cls
index b1cfd187..1a1e3e26 100644
--- a/Version Control.accda.src/modules/clsSourceParser.cls	
+++ b/Version Control.accda.src/modules/clsSourceParser.cls	
@@ -137,7 +137,7 @@ Public Sub MergeVBA(strVbaCode As String)
     Dim lngLine As Long
 
     ' Make sure we have some output
-    If Not Len(this.strOutput) Then this.strOutput = this.strInput
+    If Len(this.strOutput) = 0 Then this.strOutput = this.strInput
 
     ' Rebuild output using provided VBA code
     With New clsConcat
@@ -182,7 +182,7 @@ Public Sub MergePrintSettings(strJson As String)
     Dim dSettings As Dictionary
 
     ' Make sure we have some output
-    If Not Len(this.strOutput) Then this.strOutput = this.strInput
+    If Len(this.strOutput) = 0 Then this.strOutput = this.strInput
 
     ' Don't try to parse an empty string
     If strJson = vbNullString Then Exit Sub
diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas
index cc09512f..21bf7f7d 100644
--- a/Version Control.accda.src/modules/modVCSUtility.bas	
+++ b/Version Control.accda.src/modules/modVCSUtility.bas	
@@ -611,8 +611,10 @@ Public Sub LoadComponentFromText(intType As AcObjectType, strName As String, str
         Perf.OperationEnd
     End If
 
-    ' Clean up any temp file
-    If FSO.FileExists(strSourceFile) Then DeleteFile strSourceFile
+    ' Clean up any additional temp file used in the building process
+    If strFile <> strSourceFile Then
+        If FSO.FileExists(strSourceFile) Then DeleteFile strSourceFile
+    End If
 
     ' Check for VBA overlay
     If blnVbaOverlay Then OverlayCodeModule strName, SwapExtension(strFile, "cls")