diff --git a/extra/bootstrap/image/upload/upload.factor b/extra/bootstrap/image/upload/upload.factor
index e78c3541d4..29c9d5b072 100755
--- a/extra/bootstrap/image/upload/upload.factor
+++ b/extra/bootstrap/image/upload/upload.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: http.client checksums checksums.openssl splitting assocs
+USING: checksums checksums.openssl splitting assocs
 kernel io.files bootstrap.image sequences io namespaces
 io.launcher math io.encodings.ascii ;
 IN: bootstrap.image.upload
diff --git a/extra/http/http-tests.factor b/extra/http/http-tests.factor
index a3b9676aac..daac4d6dd9 100755
--- a/extra/http/http-tests.factor
+++ b/extra/http/http-tests.factor
@@ -45,6 +45,7 @@ blah
 
 [
     TUPLE{ request
+        protocol: http
         port: 80
         method: "GET"
         path: "/bar"
@@ -84,6 +85,7 @@ Host: www.sex.com
 
 [
     TUPLE{ request
+        protocol: http
         port: 80
         method: "HEAD"
         path: "/bar"
diff --git a/extra/http/http.factor b/extra/http/http.factor
index bbbebda53a..6efbd42fd2 100755
--- a/extra/http/http.factor
+++ b/extra/http/http.factor
@@ -265,7 +265,7 @@ cookies ;
     pick query>> set-at ;
 
 : chop-hostname ( str -- str' )
-    ":" split1 nip
+    ":" split1 "//" ?head drop nip
     CHAR: / over index over length or tail
     dup empty? [ drop "/" ] when ;
 
@@ -440,7 +440,7 @@ M: https protocol-addr
             dup host>> [
                 [ protocol>> protocol>string write "://" write ]
                 [ host>> url-encode write ":" write ]
-                [ port>> number>string write ]
+                [ [ port>> ] [ protocol>> http-port or ] bi number>string write ]
                 tri
             ] [ drop ] if
         ]
diff --git a/extra/http/server/server-tests.factor b/extra/http/server/server-tests.factor
index a5dffbc58b..af27eda527 100755
--- a/extra/http/server/server-tests.factor
+++ b/extra/http/server/server-tests.factor
@@ -6,6 +6,7 @@ IN: http.server.tests
 
 [
     <request>
+    http >>protocol
     "www.apple.com" >>host
     "/xxx/bar" >>path
     { { "a" "b" } } >>query
diff --git a/extra/io/unix/files/unique/unique.factor b/extra/io/unix/files/unique/unique.factor
index 54ced6e5ce..dca2f51958 100644
--- a/extra/io/unix/files/unique/unique.factor
+++ b/extra/io/unix/files/unique/unique.factor
@@ -6,6 +6,6 @@ IN: io.unix.files.unique
     { O_RDWR O_CREAT O_EXCL } flags ;
 
 M: unix (make-unique-file) ( path -- )
-    open-unique-flags file-mode open dup io-error close ;
+    open-unique-flags file-mode open-file close-file ;
 
 M: unix temporary-path ( -- path ) "/tmp" ;