diff --git a/extra/calendar/format/format.factor b/extra/calendar/format/format.factor
index ea8d387e01..75ceea8ea2 100755
--- a/extra/calendar/format/format.factor
+++ b/extra/calendar/format/format.factor
@@ -1,6 +1,6 @@
 IN: calendar.format
 USING: math math.parser kernel sequences io calendar
-accessors arrays io.streams.string combinators ;
+accessors arrays io.streams.string combinators accessors ;
 
 GENERIC: day. ( obj -- )
 
diff --git a/extra/io/paths/paths.factor b/extra/io/paths/paths.factor
index fae07643d5..4acfb9acad 100755
--- a/extra/io/paths/paths.factor
+++ b/extra/io/paths/paths.factor
@@ -1,5 +1,5 @@
 USING: io.files kernel sequences new-slots accessors
-dlists arrays ;
+dlists arrays sequences.lib ;
 IN: io.paths
 
 TUPLE: directory-iterator path bfs queue ;
diff --git a/extra/lcd/lcd.factor b/extra/lcd/lcd.factor
index c2eba8b7b6..952bc17f17 100755
--- a/extra/lcd/lcd.factor
+++ b/extra/lcd/lcd.factor
@@ -1,5 +1,6 @@
-USING: sequences kernel math io calendar calendar.model
-arrays models namespaces ui.gadgets ui.gadgets.labels
+USING: sequences kernel math io calendar calendar.format
+calendar.model arrays models namespaces ui.gadgets
+ui.gadgets.labels
 ui.gadgets.theme ui ;
 IN: lcd
 
diff --git a/extra/logging/parser/parser.factor b/extra/logging/parser/parser.factor
index b4c7e12772..015861501e 100755
--- a/extra/logging/parser/parser.factor
+++ b/extra/logging/parser/parser.factor
@@ -3,7 +3,7 @@
 USING: parser-combinators memoize kernel sequences
 logging arrays words strings vectors io io.files
 namespaces combinators combinators.lib logging.server
-calendar ;
+calendar calendar.format ;
 IN: logging.parser
 
 : string-of satisfy <!*> [ >string ] <@ ;
diff --git a/extra/logging/server/server.factor b/extra/logging/server/server.factor
index e31391e5d5..94d112583a 100755
--- a/extra/logging/server/server.factor
+++ b/extra/logging/server/server.factor
@@ -3,7 +3,7 @@
 USING: namespaces kernel io calendar sequences io.files
 io.sockets continuations prettyprint assocs math.parser
 words debugger math combinators concurrency.messaging
-threads arrays init math.ranges strings ;
+threads arrays init math.ranges strings calendar.format ;
 IN: logging.server
 
 : log-root ( -- string )
diff --git a/extra/project-euler/019/019.factor b/extra/project-euler/019/019.factor
index fd3ca02135..391af05ffa 100644
--- a/extra/project-euler/019/019.factor
+++ b/extra/project-euler/019/019.factor
@@ -45,14 +45,14 @@ IN: project-euler.019
 <PRIVATE
 
 : start-date ( -- timestamp )
-    1901 1 1 0 0 0 0 make-timestamp ;
+    1901 1 1 0 0 0 0 <timestamp> ;
 
 : end-date ( -- timestamp )
-    2000 12 31 0 0 0 0 make-timestamp ;
+    2000 12 31 0 0 0 0 <timestamp> ;
 
 : (first-days) ( end-date start-date -- )
-    2dup timestamp- 0 >= [
-        dup day-of-week , 1 +month (first-days)
+    2dup time- 0 >= [
+        dup day-of-week , 1 months time+ (first-days)
     ] [
         2drop
     ] if ;
diff --git a/extra/smtp/smtp.factor b/extra/smtp/smtp.factor
index 184bd0c1cc..f3f90f68b9 100755
--- a/extra/smtp/smtp.factor
+++ b/extra/smtp/smtp.factor
@@ -3,7 +3,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: namespaces io io.timeouts kernel logging io.sockets
 sequences combinators sequences.lib splitting assocs strings
-math.parser random system calendar ;
+math.parser random system calendar calendar.format ;
 
 IN: smtp
 
diff --git a/extra/webapps/cgi/cgi.factor b/extra/webapps/cgi/cgi.factor
index 1ef83abbe7..5dba9dae00 100755
--- a/extra/webapps/cgi/cgi.factor
+++ b/extra/webapps/cgi/cgi.factor
@@ -14,7 +14,7 @@ SYMBOL: cgi-root
     [
         "CGI/1.0" "GATEWAY_INTERFACE" set
         "HTTP/1.0" "SERVER_PROTOCOL" set
-        "Factor " version append "SERVER_SOFTWARE" set
+        "Factor" "SERVER_SOFTWARE" set
 
         dup "PATH_TRANSLATED" set
         "SCRIPT_FILENAME" set
diff --git a/extra/webapps/file/file.factor b/extra/webapps/file/file.factor
index 898ae35f1a..411c70c76a 100755
--- a/extra/webapps/file/file.factor
+++ b/extra/webapps/file/file.factor
@@ -3,7 +3,7 @@
 USING: calendar html io io.files kernel math math.parser
 http.server.responders http.server.templating namespaces parser
 sequences strings assocs hashtables debugger http.mime sorting
-html.elements logging ;
+html.elements logging calendar.format ;
 IN: webapps.file
 
 SYMBOL: doc-root
diff --git a/extra/webapps/pastebin/pastebin.factor b/extra/webapps/pastebin/pastebin.factor
index 21bae57fe7..36a72795db 100755
--- a/extra/webapps/pastebin/pastebin.factor
+++ b/extra/webapps/pastebin/pastebin.factor
@@ -1,6 +1,6 @@
 USING: calendar furnace furnace.validator io.files kernel
 namespaces sequences http.server.responders html math.parser rss
-xml.writer xmode.code2html math ;
+xml.writer xmode.code2html math calendar.format ;
 IN: webapps.pastebin
 
 TUPLE: pastebin pastes ;
diff --git a/extra/webapps/planet/planet.factor b/extra/webapps/planet/planet.factor
index 062f6dbce2..9a5f8eeb97 100755
--- a/extra/webapps/planet/planet.factor
+++ b/extra/webapps/planet/planet.factor
@@ -2,7 +2,7 @@ USING: sequences rss arrays concurrency.combinators kernel
 sorting html.elements io assocs namespaces math threads vocabs
 html furnace http.server.templating calendar math.parser
 splitting continuations debugger system http.server.responders
-xml.writer prettyprint logging ;
+xml.writer prettyprint logging calendar.format ;
 IN: webapps.planet
 
 : print-posting-summary ( posting -- )
diff --git a/extra/windows/time/time.factor b/extra/windows/time/time.factor
index 5409edbb75..011f500d88 100755
--- a/extra/windows/time/time.factor
+++ b/extra/windows/time/time.factor
@@ -23,7 +23,7 @@ IN: windows.time
 
 : timestamp>windows-time ( timestamp -- n )
     #! 64bit number representing # of nanoseconds since Jan 1, 1601 (UTC)
-    >gmt windows-1601 timestamp- >bignum 10000000 * ;
+    >gmt windows-1601 time- >integer 10000000 * ;
 
 : windows-time>FILETIME ( n -- FILETIME )
     "FILETIME" <c-object>
diff --git a/extra/xml-rpc/xml-rpc.factor b/extra/xml-rpc/xml-rpc.factor
index a7603a939e..ffccb5e0f5 100644
--- a/extra/xml-rpc/xml-rpc.factor
+++ b/extra/xml-rpc/xml-rpc.factor
@@ -3,7 +3,8 @@
 IN: xml-rpc
 USING: kernel xml arrays math generic http.client combinators
     hashtables namespaces io base64 sequences strings calendar
-    xml.data xml.writer xml.utilities assocs math.parser debugger ;
+    xml.data xml.writer xml.utilities assocs math.parser debugger
+    calendar.format ;
 
 ! * Sending RPC requests
 ! TODO: time