diff --git a/app/src/gambas3/.src/Connection/FPasteTable.class b/app/src/gambas3/.src/Connection/FPasteTable.class
index a0161f106..f0c785631 100644
--- a/app/src/gambas3/.src/Connection/FPasteTable.class
+++ b/app/src/gambas3/.src/Connection/FPasteTable.class
@@ -7,7 +7,7 @@ Static Private $sTable As String
 
 Static Private $iCpt As Integer
 Static Private $iTotal As Integer
-Static Private $eTimer As Float
+Static Private $fTimer As Float
 
 Public Sub Run(hSrc As FConnectionEditor, sTable As String, hDest As FConnectionEditor) As Boolean
 
@@ -92,7 +92,7 @@ Private Sub CopyTable(sDestTable As String)
   Endif
 
   $iCpt = 0
-  $eTimer = Timer
+  $fTimer = Timer
 
   'DB.Debug = True
   DoCopyTable(hSrc, hDst, $sTable, sDestTable)
@@ -204,10 +204,10 @@ End
 Private Sub UpdateProgress(Optional bForce As Boolean)
 
   If Not bForce Then
-    If Timer < $eTimer Then Return
+    If Timer < $fTimer Then Return
   Endif
 
-  $eTimer = Timer + 0.25
+  $fTimer = Timer + 0.25
 
   If $iTotal Then
     pgbPaste.Value = CFloat($iCpt) / $iTotal
diff --git a/app/src/gambas3/.src/Editor/Code/FProcedureList.class b/app/src/gambas3/.src/Editor/Code/FProcedureList.class
index c089038d0..2284a2ed9 100644
--- a/app/src/gambas3/.src/Editor/Code/FProcedureList.class
+++ b/app/src/gambas3/.src/Editor/Code/FProcedureList.class
@@ -6,7 +6,7 @@ Private $iCurrent As Integer
 Private $iInit As Integer
 Private $sClass As String
 Private $sFind As String
-Private $dFind As Float
+Private $fTimerFind As Float
 Private $hModule As FEditor
 Private $bNoFilter As Boolean
 
@@ -40,7 +40,7 @@ Public Sub Init(hModule As FEditor, sClass As String, aProc As String[], iCurren
   Try gvwProc[$iCurrent, 0].EnsureVisible
   
   $sFind = ""
-  $dFind = Timer
+  $fTimerFind = Timer
   
 End
 
@@ -128,9 +128,9 @@ Public Sub gvwProc_KeyPress()
     Me.Close
     Stop Event
   Else If Key.Text Then
-    If (Timer - $dFind) >= 1 Then $sFind = ""
+    If (Timer - $fTimerFind) >= 1 Then $sFind = ""
     $sFind &= String.LCase(Key.Text)
-    $dFind = Timer
+    $fTimerFind = Timer
     FindProcedure
   Else If Key.Code = Key.Up Then
     If $iCurrent > 0 Then SetCurrent($iCurrent - 1)
diff --git a/app/src/gambas3/.src/Editor/Code/FTextEditor.class b/app/src/gambas3/.src/Editor/Code/FTextEditor.class
index 1315b5bd2..b4314564a 100644
--- a/app/src/gambas3/.src/Editor/Code/FTextEditor.class
+++ b/app/src/gambas3/.src/Editor/Code/FTextEditor.class
@@ -1093,7 +1093,7 @@ Private Sub FillProc()
   Dim iLine As Integer
   Dim sText As String
   Dim sProc, sProcNum As String
-  Dim iNum As String
+  Dim iNum As Integer
   Dim bDecl As Boolean
 
   If $cProc Then Return
diff --git a/app/src/gambas3/.src/Editor/Form/FMenu.class b/app/src/gambas3/.src/Editor/Form/FMenu.class
index 55cbfbbcc..83737e5e0 100644
--- a/app/src/gambas3/.src/Editor/Form/FMenu.class
+++ b/app/src/gambas3/.src/Editor/Form/FMenu.class
@@ -482,7 +482,7 @@ Public Sub btnDelete_Click()
 
 End
 
-Private Sub InsertMenuAt(iIndex As String, sName As String, iLevel As Integer) As CMenu
+Private Sub InsertMenuAt(iIndex As Integer, sName As String, iLevel As Integer) As CMenu
 
   Dim hCMenu As CMenu
   
diff --git a/app/src/gambas3/.src/Editor/Image/FImageEditor.class b/app/src/gambas3/.src/Editor/Image/FImageEditor.class
index 3bfe22b3f..c654dda8f 100644
--- a/app/src/gambas3/.src/Editor/Image/FImageEditor.class
+++ b/app/src/gambas3/.src/Editor/Image/FImageEditor.class
@@ -71,7 +71,7 @@ Private Enum CHANGE_NOTHING, CHANGE_MOVE, CHANGE_RESIZE, CHANGE_ROTATE, CHANGE_P
 Private $bShowGrid As Boolean
 Private $hTextSelect As CImageSelection
 
-Private $sLastColor As Integer
+Private $iLastColor As Integer
 Private $cInfo As New Collection
 Private $bInfoTop As Boolean
 
@@ -1506,7 +1506,7 @@ Public Sub Form_KeyPress()
   
   If $sTool = "draw" Then
     If LCase(Key.Text) = "x" Then
-      FImageProperty.SetColor($sLastColor)
+      FImageProperty.SetColor($iLastColor)
     Endif
   Endif
   
@@ -1581,7 +1581,7 @@ Public Sub imvImage_MouseUp()
         
         If $sTool = "draw" Then
           If $hLastPoint And If $hImage[$hLastPoint.X, $hLastPoint.Y] <> FImageProperty.GetColor() Then
-            $sLastColor = $hImage[$hLastPoint.X, $hLastPoint.Y]
+            $iLastColor = $hImage[$hLastPoint.X, $hLastPoint.Y]
           Endif
         Endif
         
diff --git a/app/src/gambas3/.src/Editor/Image/FImageProperty.class b/app/src/gambas3/.src/Editor/Image/FImageProperty.class
index 0f817fcc5..00fc1bbc4 100644
--- a/app/src/gambas3/.src/Editor/Image/FImageProperty.class
+++ b/app/src/gambas3/.src/Editor/Image/FImageProperty.class
@@ -20,16 +20,16 @@ Private $lblA2 As DrawingArea
 Private $MX As Integer
 Private $MY As Integer
 'Valeur radiales
-Private $fX As Float = 0.5
-Private $fY As Float = 0.5
-Private $cX As Float = 0.5
-Private $cY As Float = 0.5
+Private $FX As Float = 0.5
+Private $FY As Float = 0.5
+Private $CX As Float = 0.5
+Private $CY As Float = 0.5
 Private $fRadius As Float = 1 / Sqr(2)
 'valeur linéaires
-Private $flX1 As Float = 0
-Private $flY1 As Float = 0.5
-Private $flX2 As Float = 1
-Private $flY2 As Float = 0.5
+Private $X1 As Float = 0
+Private $Y1 As Float = 0.5
+Private $X2 As Float = 1
+Private $Y2 As Float = 0.5
 
 Private $iLineCap As Integer
 Private $iLineJoin As Integer
@@ -337,13 +337,13 @@ Public Sub dwgGradient_Draw()
   ' If radRadial.Value Then
   '   
   '   
-  '   Paint.Brush = Paint.RadialGradient((Paint.Width - 10) * $cX, (Paint.Height - 10) * $cY, (Paint.Width - 10) * 2 * $fRadius, (Paint.Width - 10) * $fX, (Paint.Height - 10) * $fY, $aGradientColors, $aGradientPos)
+  '   Paint.Brush = Paint.RadialGradient((Paint.Width - 10) * $CX, (Paint.Height - 10) * $CY, (Paint.Width - 10) * 2 * $fRadius, (Paint.Width - 10) * $FX, (Paint.Height - 10) * $FY, $aGradientColors, $aGradientPos)
   '   Paint.Rectangle(5, 5, Paint.Width - 10, Paint.Height - 10)
   '   Paint.Fill
   '   
   ' Else
   '   
-  '   Paint.Brush = Paint.LinearGradient((Paint.Width - 10) * $flX1, (Paint.Height - 10) * $flY1, (Paint.Width - 10) * $flX2, (Paint.Height - 10) * $flY2, $aGradientColors, $aGradientPos)
+  '   Paint.Brush = Paint.LinearGradient((Paint.Width - 10) * $X1, (Paint.Height - 10) * $Y1, (Paint.Width - 10) * $X2, (Paint.Height - 10) * $Y2, $aGradientColors, $aGradientPos)
   '   Paint.Rectangle(5, 5, Paint.Width - 10, Paint.Height - 10)
   '   Paint.Fill
   '   Paint.Brush = Paint.Color(Color.Black)
@@ -479,9 +479,9 @@ End
 '       
 '     Case CReportBrush.TYPE_LINEAR_GRADIENT, CReportBrush.TYPE_RADIAL_GRADIENT
 '       If cmbType.Index = CReportBrush.TYPE_RADIAL_GRADIENT Then
-'         sValue = "RadialGradient(" & $cx & "," & $cy & "," & $fRadius & "," & $fx & "," & $fy & ",["
+'         sValue = "RadialGradient(" & $CX & "," & $CY & "," & $fRadius & "," & $FX & "," & $FY & ",["
 '       Else
-'         sValue = "LinearGradient(" & $flX1 & "," & $flY1 & "," & $flX2 & "," & $flY2 & ",["
+'         sValue = "LinearGradient(" & $X1 & "," & $Y1 & "," & $X2 & "," & $Y2 & ",["
 '       Endif
 '       
 '       For Each i In $aGradientColors
@@ -531,19 +531,19 @@ Private Sub UpdateAngle()
     
     If hLabel.Tag = 1 Then
       If radLinear.Value Then
-        $flX1 = X
-        $flY1 = Y
+        $X1 = X
+        $Y1 = Y
       Else
-        $cX = X
-        $cY = Y
+        $CX = X
+        $CY = Y
       Endif
     Else
       If radLinear.Value Then
-        $flX2 = X
-        $flY2 = Y
+        $X2 = X
+        $Y2 = Y
       Else
-        $fX = X
-        $fY = Y
+        $FX = X
+        $FY = Y
       Endif
     Endif
     
@@ -737,15 +737,15 @@ Private Sub MoveLabels()
   Dim X1, X2, Y1, Y2 As Float
 
   If radLinear.Value Then
-    X1 = $flX1
-    Y1 = $flY1
-    X2 = $flX2
-    Y2 = $flY2
+    X1 = $X1
+    Y1 = $Y1
+    X2 = $X2
+    Y2 = $Y2
   Else
-    X1 = $cX
-    Y1 = $cY
-    X2 = $fX
-    Y2 = $fY
+    X1 = $CX
+    Y1 = $CY
+    X2 = $FX
+    Y2 = $FY
     sldRadius.Value = $fRadius * 100
   Endif
 
@@ -1063,16 +1063,16 @@ Private Sub ToBrush() As CReportBrush
   
   If radLinear.Value Then
     hBrush.Type = CReportBrush.TYPE_LINEAR_GRADIENT
-    hBrush.X1 = $flX1
-    hBrush.Y1 = $flY1
-    hBrush.X2 = $flX2
-    hBrush.Y2 = $flY2
+    hBrush.X1 = $X1
+    hBrush.Y1 = $Y1
+    hBrush.X2 = $X2
+    hBrush.Y2 = $Y2
   Else
     hBrush.Type = CReportBrush.TYPE_RADIAL_GRADIENT
-    hBrush.X1 = $fX
-    hBrush.Y1 = $fY
-    hBrush.X2 = $cX
-    hBrush.Y2 = $cY
+    hBrush.X1 = $FX
+    hBrush.Y1 = $FY
+    hBrush.X2 = $CX
+    hBrush.Y2 = $CY
     hBrush.Radius = $fRadius
   Endif
   
@@ -1089,16 +1089,16 @@ Private Sub FromBrush(hBrush As CReportBrush)
     
     If .Type = CReportBrush.TYPE_LINEAR_GRADIENT Then
       radLinear.Value = True
-      $flX1 = .X1
-      $flY1 = .Y1
-      $flX2 = .X2
-      $flY2 = .Y2
+      $X1 = .X1
+      $Y1 = .Y1
+      $X2 = .X2
+      $Y2 = .Y2
     Else
       radRadial.Value = True
-      $fX = .X1
-      $fY = .Y1
-      $cX = .X2
-      $cY = .Y2
+      $FX = .X1
+      $FY = .Y1
+      $CX = .X2
+      $CY = .Y2
       $fRadius = .Radius
     Endif
     
diff --git a/app/src/gambas3/.src/Family/Report/FReportBoxShadowChooser.class b/app/src/gambas3/.src/Family/Report/FReportBoxShadowChooser.class
index 280fa4228..fc7e9752a 100644
--- a/app/src/gambas3/.src/Family/Report/FReportBoxShadowChooser.class
+++ b/app/src/gambas3/.src/Family/Report/FReportBoxShadowChooser.class
@@ -37,7 +37,7 @@ Private Sub PaintShadow()
   Dim fY As Float = CFamilyReport.ToPixel(crdY.Value)
   Dim fBlur As Float = CFamilyReport.ToPixel(crdBlur.Value)
   'Dim fMaxOffset As Float = Max(fX, fY)
-  Dim fWIdth, fHeight As Integer
+  Dim fWIdth, fHeight As Float
   Dim hImg As Image
 
   fWidth = Paint.Width - 30 'fSPread * 2 - fMaxOffset - 30
diff --git a/app/src/gambas3/.src/Family/Report/FReportBrushChooser.class b/app/src/gambas3/.src/Family/Report/FReportBrushChooser.class
index a37c9226a..80e64eda2 100644
--- a/app/src/gambas3/.src/Family/Report/FReportBrushChooser.class
+++ b/app/src/gambas3/.src/Family/Report/FReportBrushChooser.class
@@ -16,16 +16,16 @@ Private $lblA2 As DrawingArea
 Private $MX As Integer
 Private $MY As Integer
 'Valeur radiales
-Private $fX As Float = 0.5
-Private $fY As Float = 0.5
-Private $cX As Float = 0.50
-Private $cY As Float = 0.50
+Private $FX As Float = 0.5
+Private $FY As Float = 0.5
+Private $CX As Float = 0.50
+Private $CY As Float = 0.50
 Private $fRadius As Float = 0.5
 'valeur linéaires
-Private $flX1 As Float = 0
-Private $flY1 As Float = 0.5
-Private $flX2 As Float = 1
-Private $flY2 As Float = 0.5
+Private $X1 As Float = 0
+Private $Y1 As Float = 0.5
+Private $X2 As Float = 1
+Private $Y2 As Float = 0.5
 
 Static Public Value As String  '"radialgradient(0.5,0.5,1,0.5,0.5,[&hFFFFFF,&h000000,&h00FF00],[0,0.5,1])" '"lineargradient(0,0.5,1,0.5,[&hFFFFFF,&h000000,&h00FF00],[0,0.5,1])"
 
@@ -69,19 +69,19 @@ Public Sub Form_Open()
       txtImage.Text = $hBrush.Path
       
     Case CReportBrush.TYPE_RADIAL_GRADIENT
-      $cX = $hBrush.X1
-      $cy = $hBrush.Y1
+      $CX = $hBrush.X1
+      $CY = $hBrush.Y1
       $fRadius = $hBrush.Radius
-      $fX = $hBrush.X2
-      $fY = $hBrush.Y2
+      $FX = $hBrush.X2
+      $FY = $hBrush.Y2
       $aGradientColors = $hBrush.Colors
       $aGradientPos = $hBrush.Positions
       
     Case CReportBrush.TYPE_LINEAR_GRADIENT
-      $flX1 = $hBrush.X1
-      $flY1 = $hBrush.Y1
-      $flX2 = $hBrush.X2
-      $flY2 = $hBrush.Y2
+      $X1 = $hBrush.X1
+      $Y1 = $hBrush.Y1
+      $X2 = $hBrush.X2
+      $Y2 = $hBrush.Y2
       $aGradientColors = $hBrush.Colors
       $aGradientPos = $hBrush.Positions
       
@@ -170,13 +170,13 @@ Public Sub dwgGradient_Draw()
   
   If cmbType.Index = CReportBrush.TYPE_RADIAL_GRADIENT Then
     
-    Paint.Brush = Paint.RadialGradient((Paint.Width - 10) * $cX, (Paint.Height - 10) * $cY, (Paint.Width - 10) * 2 * $fRadius, (Paint.Width - 10) * $fX, (Paint.Height - 10) * $fY, $aGradientColors, $aGradientPos)
+    Paint.Brush = Paint.RadialGradient((Paint.Width - 10) * $CX, (Paint.Height - 10) * $CY, (Paint.Width - 10) * 2 * $fRadius, (Paint.Width - 10) * $FX, (Paint.Height - 10) * $FY, $aGradientColors, $aGradientPos)
     Paint.Rectangle(5, 5, Paint.Width - 10, Paint.Height - 10)
     Paint.fill
     
   Else
     
-    Paint.Brush = Paint.LinearGradient((Paint.Width - 10) * $flX1, (Paint.Height - 10) * $flY1, (Paint.Width - 10) * $flX2, (Paint.Height - 10) * $flY2, $aGradientColors, $aGradientPos)
+    Paint.Brush = Paint.LinearGradient((Paint.Width - 10) * $X1, (Paint.Height - 10) * $Y1, (Paint.Width - 10) * $X2, (Paint.Height - 10) * $Y2, $aGradientColors, $aGradientPos)
     Paint.Rectangle(5, 5, Paint.Width - 10, Paint.Height - 10)
     Paint.Fill
     Paint.Brush = Paint.Color(Color.Black)
@@ -325,9 +325,9 @@ Public Sub btnOK_Click()
       
     Case CReportBrush.TYPE_LINEAR_GRADIENT, CReportBrush.TYPE_RADIAL_GRADIENT
       If cmbType.Index = CReportBrush.TYPE_RADIAL_GRADIENT Then
-        sValue = "RadialGradient(" & $cx & "," & $cy & "," & $fRadius & "," & $fx & "," & $fy & ",["
+        sValue = "RadialGradient(" & $CX & "," & $CY & "," & $fRadius & "," & $FX & "," & $FY & ",["
       Else
-        sValue = "LinearGradient(" & $flX1 & "," & $flY1 & "," & $flX2 & "," & $flY2 & ",["
+        sValue = "LinearGradient(" & $X1 & "," & $Y1 & "," & $X2 & "," & $Y2 & ",["
       Endif
       
       For Each i In $aGradientColors
@@ -377,19 +377,19 @@ Private Sub UpdateAngle()
     
     If hLabel.Tag = 1 Then
       If cmbType.Index = CReportBrush.TYPE_LINEAR_GRADIENT Then
-        $flX1 = X
-        $flY1 = Y
+        $X1 = X
+        $Y1 = Y
       Else
-        $cX = X
-        $cY = Y
+        $CX = X
+        $CY = Y
       Endif
     Else
       If cmbType.Index = CReportBrush.TYPE_LINEAR_GRADIENT Then
-        $flX2 = X
-        $flY2 = Y
+        $X2 = X
+        $Y2 = Y
       Else
-        $fX = X
-        $fY = Y
+        $FX = X
+        $FY = Y
       Endif
     Endif
     
diff --git a/app/src/gambas3/.src/Help/FTips.class b/app/src/gambas3/.src/Help/FTips.class
index 60a6a3bf7..0d90e0e68 100644
--- a/app/src/gambas3/.src/Help/FTips.class
+++ b/app/src/gambas3/.src/Help/FTips.class
@@ -141,7 +141,7 @@ End
 Private Sub PaintRoundedRect(X As Integer, Y As Integer, W As Integer, H As Integer, R As Float)
 
   Dim fArcToBezier As Float = 0.55228475
-  Dim fRadiusX, fRadiusY, c1, c2 As Float
+  Dim fRadiusX, fRadiusY, C1, C2 As Float
 
   fRadiusX = R
   fRadiusY = R
@@ -150,19 +150,19 @@ Private Sub PaintRoundedRect(X As Integer, Y As Integer, W As Integer, H As Inte
   If fRadiusY > H - fRadiusY Then fRadiusY = H / 2
 
   '#approximate(quite Close )the arc using a bezier curve
-  c1 = fArcToBezier * fRadiusX
-  c2 = fArcToBezier * fRadiusY
+  C1 = fArcToBezier * fRadiusX
+  C2 = fArcToBezier * fRadiusY
 
   Paint.NewPath()
   Paint.MoveTo(x + fRadiusX, y)
   Paint.RelLineTo(w - 2 * fRadiusX, 0.0)
-  Paint.RelCurveTo(c1, 0.0, fRadiusX, c2, fRadiusX, fRadiusY)
+  Paint.RelCurveTo(C1, 0.0, fRadiusX, C2, fRadiusX, fRadiusY)
   Paint.RelLineTo(0, h - 2 * fRadiusY)
-  Paint.RelCurveTo(0.0, c2, c1 - fRadiusX, fRadiusY, -fRadiusX, fRadiusY)
+  Paint.RelCurveTo(0.0, C2, C1 - fRadiusX, fRadiusY, -fRadiusX, fRadiusY)
   Paint.RelLineTo(-w + 2 * fRadiusX, 0)
-  Paint.RelCurveTo(-c1, 0, -fRadiusX, -c2, -fRadiusX, -fRadiusY)
+  Paint.RelCurveTo(-C1, 0, -fRadiusX, -C2, -fRadiusX, -fRadiusY)
   Paint.RelLineTo(0, -h + 2 * fRadiusY)
-  Paint.RelCurveTo(0.0, -c2, fRadiusX - c1, -fRadiusY, fRadiusX, -fRadiusY)
+  Paint.RelCurveTo(0.0, -C2, fRadiusX - C1, -fRadiusY, fRadiusX, -fRadiusY)
   Paint.ClosePath()
 
 End
diff --git a/app/src/gambas3/.src/Packager/Package.module b/app/src/gambas3/.src/Packager/Package.module
index 50882a267..7fd58c26e 100644
--- a/app/src/gambas3/.src/Packager/Package.module
+++ b/app/src/gambas3/.src/Packager/Package.module
@@ -1321,10 +1321,10 @@ Private Sub ChangelogToDebChangelog(sPackageName As String) As String
  
   Dim aLine As String[]
   Dim sLine As String
-  Dim debChangelog As String
+  Dim sDebChangeLog As String
   Dim sDate As String
   Dim sBits As String[]
-  Dim previousLine As String
+  Dim sPreviousLine As String
   Dim sWord As String
   Dim sNextWord As String
   Dim aWord As String[]
@@ -1337,23 +1337,23 @@ Private Sub ChangelogToDebChangelog(sPackageName As String) As String
       
       If sDate <> "" Then
         'Debian packages don't accept an empty changelog line for the release:
-        If previousLine = sPackageName & " (" & $sVersionWithRelease & ") unstable; urgency=low" & "\n\n" Then 
-          debChangelog = debChangelog & "  * New release version\n"
+        If sPreviousLine = sPackageName & " (" & $sVersionWithRelease & ") unstable; urgency=low" & "\n\n" Then 
+          sDebChangeLog = sDebChangeLog & "  * New release version\n"
         Endif   
-        debChangelog = debChangelog & "\n -- " & Project.Maintainer & " <" & Project.Address & ">  " & sDate & "\n\n"
+        sDebChangeLog = sDebChangeLog & "\n -- " & Project.Maintainer & " <" & Project.Address & ">  " & sDate & "\n\n"
       Endif
       sbits = Split(Trim$(sLine), " ")
       sDate = sbits[1] & ", " & sbits[3] & " " & sbits[2] & " " & sbits[4] & " 12:00:00 +0000"
       'sVersion = GetDebVersion()
-      previousLine = sPackageName & " (" & $sVersionWithRelease & ") unstable; urgency=low" & "\n\n"
-      debChangelog &= previousLine
+      sPreviousLine = sPackageName & " (" & $sVersionWithRelease & ") unstable; urgency=low" & "\n\n"
+      sDebChangeLog &= sPreviousLine
     
     Else 
       
       If Trim$(sLine) <> "" Then
         
         aWord = Split(Right$(sLine, -2), " ")
-        previousLine = "  * "
+        sPreviousLine = "  * "
         sLine = ""
         For Each sWord In aWord
           Repeat
@@ -1364,7 +1364,7 @@ Private Sub ChangelogToDebChangelog(sPackageName As String) As String
               sNextWord = ""
             Endif
             If String.Len(sLine & sWord) > 76 Then
-              previousLine &= sLine & "\n    "
+              sPreviousLine &= sLine & "\n    "
               sLine = sWord
             Else
               sLine = LTrim(sLine & " " & sWord)
@@ -1372,9 +1372,9 @@ Private Sub ChangelogToDebChangelog(sPackageName As String) As String
             sWord = sNextWord
           Until Not sWord
         Next
-        If sLine Then previousLine &= sLine & "\n"
+        If sLine Then sPreviousLine &= sLine & "\n"
         
-        debChangelog &= previousLine
+        sDebChangeLog &= sPreviousLine
         
       Endif
       
@@ -1382,9 +1382,9 @@ Private Sub ChangelogToDebChangelog(sPackageName As String) As String
     
   Next 
   
-  debChangelog &= "\n -- " & Project.Maintainer & " <" & Project.Address & ">  " & sDate & "\n"
+  sDebChangeLog &= "\n -- " & Project.Maintainer & " <" & Project.Address & ">  " & sDate & "\n"
   
-  Return debChangelog 
+  Return sDebChangeLog 
 
 End
 
diff --git a/app/src/gambas3/.src/VersionControl/FProjectVersion.class b/app/src/gambas3/.src/VersionControl/FProjectVersion.class
index f9125ab68..b0e3702f2 100644
--- a/app/src/gambas3/.src/VersionControl/FProjectVersion.class
+++ b/app/src/gambas3/.src/VersionControl/FProjectVersion.class
@@ -184,7 +184,7 @@ End
 Public Sub btnUpdate_Click()
 
   Dim bErr As Boolean
-  Dim hFile As Variant
+  Dim hFile As Object
 
   Inc Application.Busy
   GetAuthentication