diff --git a/webapp/src/page/mod.rs b/webapp/src/page/mod.rs
index 3f357f2ee..cd527578b 100644
--- a/webapp/src/page/mod.rs
+++ b/webapp/src/page/mod.rs
@@ -42,7 +42,7 @@ impl<T: WebApp> Endpoint for PageEndpoint<T> {
 		Box::new(PageHandler {
 			app: self.app.clone(),
 			prefix: prefix.to_owned(),
-			prefix2: prefix.to_owned() + "/",
+			prefix_with_slash: prefix.to_owned() + "/",
 			path: None,
 			write_pos: 0,
 		})
@@ -52,7 +52,7 @@ impl<T: WebApp> Endpoint for PageEndpoint<T> {
 struct PageHandler<T: WebApp + 'static> {
 	app: Arc<T>,
 	prefix: String,
-	prefix2: String,
+	prefix_with_slash: String,
 	path: Option<String>,
 	write_pos: usize,
 }
@@ -60,12 +60,11 @@ struct PageHandler<T: WebApp + 'static> {
 impl<T: WebApp + 'static> server::Handler<HttpStream> for PageHandler<T> {
 	fn on_request(&mut self, req: server::Request) -> Next {
 		if let RequestUri::AbsolutePath(ref path) = *req.uri() {
-			// Support index file
-			if path == &self.prefix || path == &self.prefix2 {
-				self.path = Some("index.html".to_owned());
-			} else {
-				self.path = Some(path[self.prefix2.len()..].to_owned());
-			}
+			// Index file support
+			self.path = match path == &self.prefix || path == &self.prefix_with_slash {
+				true => Some("index.html".to_owned()),
+				false => Some(path[self.prefix_with_slash.len()..].to_owned()),
+			};
 		}
 		Next::write()
 	}
diff --git a/webapp/src/rpc.rs b/webapp/src/rpc.rs
index cc2a64376..d80476904 100644
--- a/webapp/src/rpc.rs
+++ b/webapp/src/rpc.rs
@@ -25,13 +25,13 @@ use endpoint::Endpoint;
 pub fn rpc(handler: Arc<IoHandler>) -> Box<Endpoint> {
 	Box::new(RpcEndpoint {
 		handler: handler,
-		cors_domain: AccessControlAllowOrigin::Null
+		cors_domain: Some(AccessControlAllowOrigin::Null)
 	})
 }
 
 struct RpcEndpoint {
 	handler: Arc<IoHandler>,
-	cors_domain: AccessControlAllowOrigin,
+	cors_domain: Option<AccessControlAllowOrigin>,
 }
 
 impl Endpoint for RpcEndpoint {