diff --git a/rust-toolchain b/rust-toolchain
index fb7648c..2818bd0 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2019-10-04
+nightly-2019-10-14
diff --git a/samplecode/wasmi/app/src/main.rs b/samplecode/wasmi/app/src/main.rs
index 760f033..613a903 100644
--- a/samplecode/wasmi/app/src/main.rs
+++ b/samplecode/wasmi/app/src/main.rs
@@ -162,7 +162,7 @@
         }
     };
 
-    let token_file: path::PathBuf = home_dir.join(ENCLAVE_TOKEN);;
+    let token_file: path::PathBuf = home_dir.join(ENCLAVE_TOKEN);
     if use_token == true {
         match fs::File::open(&token_file) {
             Err(_) => {
@@ -184,11 +184,11 @@
     // Debug Support: set 2nd parameter to 1
     let debug = 1;
     let mut misc_attr = sgx_misc_attribute_t {secs_attr: sgx_attributes_t { flags:0, xfrm:0}, misc_select:0};
-    let enclave = try!(SgxEnclave::create(ENCLAVE_FILE,
-                                          debug,
-                                          &mut launch_token,
-                                          &mut launch_token_updated,
-                                          &mut misc_attr));
+    let enclave = SgxEnclave::create(ENCLAVE_FILE,
+                                     debug,
+                                     &mut launch_token,
+                                     &mut launch_token_updated,
+                                     &mut misc_attr)?;
 
     // Step 3: save the launch token if it is updated
     if use_token == true && launch_token_updated != 0 {
diff --git a/sgx_tstd/src/lib.rs b/sgx_tstd/src/lib.rs
index 4791431..5c93785 100644
--- a/sgx_tstd/src/lib.rs
+++ b/sgx_tstd/src/lib.rs
@@ -84,7 +84,7 @@
 #![feature(lang_items)]
 #![feature(log_syntax)]
 #![feature(maybe_uninit_ref)]
-#![feature(mem_take)]
+//#![feature(mem_take)]
 #![feature(needs_panic_runtime)]
 #![feature(never_type)]
 #![feature(optin_builtin_traits)]
@@ -96,7 +96,7 @@
 #![feature(slice_concat_ext)]
 #![feature(str_internals)]
 #![feature(thread_local)]
-#![feature(todo_macro)]
+//#![feature(todo_macro)]
 #![feature(toowned_clone_into)]
 #![feature(trace_macros)]
 #![feature(try_reserve)]
diff --git a/sgx_tstd/src/prelude/v1.rs b/sgx_tstd/src/prelude/v1.rs
index bebb750..86b186a 100644
--- a/sgx_tstd/src/prelude/v1.rs
+++ b/sgx_tstd/src/prelude/v1.rs
@@ -88,7 +88,7 @@
     PartialOrd,
     RustcDecodable,
     RustcEncodable,
-//    bench,
+    //bench,
     global_allocator,
     test,
     test_case,