diff --git a/.travis.yml b/.travis.yml
index b2840ac3121..c0a18ca5524 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: shell
 sudo: required
 dist: trusty
+group: deprecated-2017Q4
 services:
   - docker
 
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index 06e9cbbdf9a..81971157b84 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -911,24 +911,24 @@
                         searchWords[j].replace(/_/g, "").indexOf(val) > -1)
                     {
                         // filter type: ... queries
-                        if (typePassesFilter(typeFilter, ty) && results[fullId] === undefined) {
+                        if (typePassesFilter(typeFilter, ty.ty) && results[fullId] === undefined) {
                             index = searchWords[j].replace(/_/g, "").indexOf(val);
                         }
                     }
                     if ((lev = levenshtein(searchWords[j], val)) <= MAX_LEV_DISTANCE) {
-                        if (typePassesFilter(typeFilter, ty) === false) {
+                        if (typePassesFilter(typeFilter, ty.ty) === false) {
                             lev = MAX_LEV_DISTANCE + 1;
                         } else {
                             lev += 1;
                         }
                     }
                     if ((in_args = findArg(ty, valGenerics)) <= MAX_LEV_DISTANCE) {
-                        if (typePassesFilter(typeFilter, ty) === false) {
+                        if (typePassesFilter(typeFilter, ty.ty) === false) {
                             in_args = MAX_LEV_DISTANCE + 1;
                         }
                     }
                     if ((returned = checkReturned(ty, valGenerics)) <= MAX_LEV_DISTANCE) {
-                        if (typePassesFilter(typeFilter, ty) === false) {
+                        if (typePassesFilter(typeFilter, ty.ty) === false) {
                             returned = MAX_LEV_DISTANCE + 1;
                         }
                     }
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
index 99a0f8c3fb1..308182e6a0e 100644
--- a/src/librustdoc/html/static/rustdoc.css
+++ b/src/librustdoc/html/static/rustdoc.css
@@ -822,6 +822,7 @@ span.since {
 		margin-left: -15px;
 		padding: 0 15px;
 		position: static;
+		z-index: 1;
 	}
 
 	.sidebar > .location {
@@ -848,25 +849,34 @@ span.since {
 	}
 
 	.sidebar-menu {
-		position: absolute;
+		position: fixed;
+		z-index: 10;
 		font-size: 2rem;
 		cursor: pointer;
-		margin-top: 2px;
+		width: 45px;
+		left: 0;
+		text-align: center;
 		display: block;
+		border-bottom: 1px solid;
+		border-right: 1px solid;
 	}
 
 	.sidebar-elems {
-		background-color: #F1F1F1;
 		position: fixed;
 		z-index: 1;
 		left: 0;
 		top: 45px;
 		bottom: 0;
 		overflow-y: auto;
-		border-right: 1px solid #000;
+		border-right: 1px solid;
 		display: none;
 	}
 
+	.sidebar > .block.version {
+		border-bottom: none;
+		margin-top: 12px;
+	}
+
 	nav.sub {
 		margin: 0 auto;
 	}
diff --git a/src/librustdoc/html/static/styles/main.css b/src/librustdoc/html/static/styles/main.css
index 5cace837a55..c31808cfc0f 100644
--- a/src/librustdoc/html/static/styles/main.css
+++ b/src/librustdoc/html/static/styles/main.css
@@ -330,3 +330,16 @@ pre.ignore:hover, .information:hover + pre.ignore {
 .modal-content > .close:hover + .whiter {
 	background-color: #ff1f1f;
 }
+
+@media (max-width: 700px) {
+	.sidebar-menu {
+		background-color: #F1F1F1;
+		border-bottom-color: #e0e0e0;
+		border-right-color: #e0e0e0;
+	}
+
+	.sidebar-elems {
+		background-color: #F1F1F1;
+		border-right-color: #000;
+	}
+}
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index ee48d49da46..6f51ea67cb1 100644
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -566,8 +566,8 @@ extern "C" void LLVMRustAddModuleFlag(LLVMModuleRef M, const char *Name,
   unwrap(M)->addModuleFlag(Module::Warning, Name, Value);
 }
 
-extern "C" void LLVMRustMetadataAsValue(LLVMContextRef C, LLVMMetadataRef MD) {
-  wrap(MetadataAsValue::get(*unwrap(C), unwrap(MD)));
+extern "C" LLVMValueRef LLVMRustMetadataAsValue(LLVMContextRef C, LLVMMetadataRef MD) {
+  return wrap(MetadataAsValue::get(*unwrap(C), unwrap(MD)));
 }
 
 extern "C" LLVMRustDIBuilderRef LLVMRustDIBuilderCreate(LLVMModuleRef M) {