Index: Include/Classes/System/DateTime.ab
===================================================================
--- Include/Classes/System/DateTime.ab	(revision 81)
+++ Include/Classes/System/DateTime.ab	(revision 82)
@@ -385,7 +385,8 @@
 	Static Function FromFileTime(fileTime As FILETIME) As DateTime
 		Dim localTime As FILETIME
+		Dim time As SYSTEMTIME
 		FileTimeToLocalFileTime(fileTime, localTime)
-		Dim time As SYSTEMTIME
 		FileTimeToSystemTime(localTime, time)
+
 		Dim date As DateTime(time, Local)
 		Return date
@@ -397,4 +398,5 @@
 			.wYear = Year As Word
 			.wMonth = Month As Word
+			.wDayOfWeek = DayOfWeek As Word
 			.wDay = Day As Word
 			.wHour = Hour As Word
@@ -411,4 +413,5 @@
 		Dim time As SYSTEMTIME
 		FileTimeToSystemTime(fileTime, time)
+
 		Dim date As DateTime(time, Utc)
 		Return date
@@ -418,27 +421,26 @@
 		Dim fileTime As FILETIME
 		fileTime = ToFileTime()
-		If Kind = 1 Then
-			Dim utcTime As FILETIME
-			LocalFileTimeToFileTime(fileTime, ToFileTimeUtc)'Return
-		Else
-			Return fileTime
+		If Kind = Utc Then
+			ToFileTimeUtc = fileTime
+		Else
+			LocalFileTimeToFileTime(fileTime, ToFileTimeUtc) 'Return
 		End If
 	End Function
 
 	Function ToLocalTime() As DateTime
+		If Kind = Local Then
+			ToLocalTime = This
+		Else
+			ToLocalTime = DateTime.FromFileTime(ToFileTime())
+			ToLocalTime.Kind = Local
+		End If
+	End Function
+
+	Function ToUniversalTime() As DateTime
 		If Kind = Utc Then
-			ToLocalTime = DateTime.FromFileTime(ToFileTimeUtc())
-			ToLocalTime.Kind = Local
-		Else
-			ToLocalTime = This
-		End If
-	End Function
-
-	Function ToUniversalTime() As DateTime
-		If Kind = Local Then
+			ToUniversalTime = This
+		Else
 			ToUniversalTime = DateTime.FromFileTimeUtc(ToFileTimeUtc())
 			ToUniversalTime.Kind = Utc
-		Else
-			ToUniversalTime = This
 		End If
 	End Function