diff --git a/wst/trunk/date_utils.pas b/wst/trunk/date_utils.pas
index 2a641f7b6..4fbef9be1 100644
--- a/wst/trunk/date_utils.pas
+++ b/wst/trunk/date_utils.pas
@@ -433,10 +433,10 @@ var
   buffer : string;
 begin
   //hh ':' mm ':' ss ('.' s+)? (zzzzzz)?
-  if ( ( ATime.Hour < 0 ) or ( ATime.Hour > 23 ) ) or
-     ( ( ATime.Minute < 0 ) or ( ATime.Minute > 59 ) ) or
-     ( ( ATime.Second < 0 ) or ( ATime.Second > 59 ) ) or
-     ( ATime.MilliSecond < 0 )
+  if ( {( ATime.Hour < 0 ) or} ( ATime.Hour > 23 ) ) or
+     ( {( ATime.Minute < 0 ) or} ( ATime.Minute > 59 ) ) or
+     ( {( ATime.Second < 0 ) or} ( ATime.Second > 59 ) ) {or
+     ( ATime.MilliSecond < 0 )}
   then begin
     buffer := Format('{ Hour : %d; Minute : %d; Second : %d; SecondFractional : %d}',[ATime.Hour,ATime.Minute,ATime.Second,ATime.MilliSecond]);
     raise EConvertError.CreateFmt(SERR_InvalidTime,[buffer]);
diff --git a/wst/trunk/imp_utils.pas b/wst/trunk/imp_utils.pas
index d1c1cc714..d41389091 100644
--- a/wst/trunk/imp_utils.pas
+++ b/wst/trunk/imp_utils.pas
@@ -147,6 +147,8 @@ begin
         prcsn := 7;
 {$IFEND}
       end;
+    else
+      prcsn := 7;
   end;
   frmt := '#.' + StringOfChar('#',prcsn) + 'E-0';
 {$IFDEF HAS_FORMAT_SETTINGS}
diff --git a/wst/trunk/ws_helper/ws_parser_imp.pas b/wst/trunk/ws_helper/ws_parser_imp.pas
index 6c47bc716..dd51c363c 100644
--- a/wst/trunk/ws_helper/ws_parser_imp.pas
+++ b/wst/trunk/ws_helper/ws_parser_imp.pas
@@ -1384,6 +1384,7 @@ var
 begin
   if not AnsiSameText(ExtractNameFromQName(FTypeNode.NodeName),s_complexType) then
     raise EXsdParserAssertException.CreateFmt('%s expected but %s found.',[s_complexType,ExtractNameFromQName(FTypeNode.NodeName)]);
+  Result := nil;
   CreateNodeCursors();
   ExtractTypeName();
   locContinue := True;
@@ -1604,6 +1605,7 @@ var
 begin
   if not AnsiSameText(ExtractNameFromQName(FTypeNode.NodeName),s_simpleType) then
     raise EXsdParserAssertException.CreateFmt('%s expected but %s found.',[s_simpleType,ExtractNameFromQName(FTypeNode.NodeName)]);
+  Result := nil;
   CreateNodeCursors();
   ExtractTypeName();
   locContinue := True;