diff --git a/Makefile.in b/Makefile.in
index bacb8a0d..cbc3bdf8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 export RUSTC = rustc
 RUSTDOC = rustdoc
-export RUSTFLAGS = -O -Z extra-debug-info --cfg ndebug
+export RUSTFLAGS = -O -g --cfg ndebug
 BUILDDIR = build
 INSTALL_DIR = %PREFIX%
 
diff --git a/src/lib.rs b/src/lib.rs
index bc848358..7ae02142 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -87,7 +87,7 @@ use std::io::net::tcp::TcpStream;
 use std::io::net;
 use std::str;
 use std::task;
-use std::util;
+use std::mem;
 
 use error::{PostgresDbError,
             PgConnectDbError,
@@ -539,7 +539,7 @@ impl InnerPostgresConnection {
 
     fn set_notice_handler(&mut self, handler: ~PostgresNoticeHandler)
             -> ~PostgresNoticeHandler {
-        util::replace(&mut self.notice_handler, handler)
+        mem::replace(&mut self.notice_handler, handler)
     }
 
     fn try_prepare<'a>(&mut self, query: &str, conn: &'a PostgresConnection)
diff --git a/submodules/rust-openssl b/submodules/rust-openssl
index 360fa1f0..7c1de97c 160000
--- a/submodules/rust-openssl
+++ b/submodules/rust-openssl
@@ -1 +1 @@
-Subproject commit 360fa1f04b575b2070f46611d9db3a852ab4a9d5
+Subproject commit 7c1de97cbfbff47600f90e4904bab85f3d77b4cf
diff --git a/submodules/rust-phf b/submodules/rust-phf
index 16947cf7..116dd402 160000
--- a/submodules/rust-phf
+++ b/submodules/rust-phf
@@ -1 +1 @@
-Subproject commit 16947cf75b2f49de80c86efb070e988a935cc1e7
+Subproject commit 116dd4020445604771d191a64f49da55f95174d1