diff --git a/build/src/main.rs b/build/src/main.rs
index 7e6e982..3c761e1 100644
--- a/build/src/main.rs
+++ b/build/src/main.rs
@@ -14,7 +14,7 @@ use std::path::PathBuf;
 use clap::{App, Arg};
 use parity_wasm::elements;
 
-use wasm_utils::{CREATE_SYMBOL, CALL_SYMBOL, underscore_funcs};
+use wasm_utils::{CREATE_SYMBOL, CALL_SYMBOL, MEMORY_SYMBOL, ununderscore_funcs};
 
 #[derive(Debug)]
 pub enum Error {
@@ -125,15 +125,7 @@ fn main() {
 	let mut module = parity_wasm::deserialize_file(&path).unwrap();
 
 	if let source::SourceTarget::Unknown = source_input.target() {
-		module = underscore_funcs(module);
-		// Removes the start section for 'wasm32-unknown-unknown' target if exists
-		module.sections_mut().retain(|section| {
-			if let &elements::Section::Start(ref _a) = section {
-				false
-			} else {
-				true
-			}
-		});
+		module = ununderscore_funcs(module);
 	}
 
 	if let Some(runtime_type) = matches.value_of("runtime_type") {
@@ -149,7 +141,10 @@ fn main() {
 	let mut ctor_module = module.clone();
 
 	if !matches.is_present("skip_optimization") {
-		wasm_utils::optimize(&mut module, vec![CALL_SYMBOL]).expect("Optimizer to finish without errors");
+		wasm_utils::optimize(
+			&mut module,
+			vec![CALL_SYMBOL, MEMORY_SYMBOL]
+		).expect("Optimizer to finish without errors");
 	}
 
 	if let Some(save_raw_path) = matches.value_of("save_raw") {
diff --git a/src/ext.rs b/src/ext.rs
index 10572e7..26752a4 100644
--- a/src/ext.rs
+++ b/src/ext.rs
@@ -49,20 +49,37 @@ pub fn externalize_mem(mut module: elements::Module) -> elements::Module {
 	module
 }
 
-pub fn underscore_funcs(mut module: elements::Module) -> elements::Module {
-	for entry in import_section(&mut module).expect("Import section to exist").entries_mut() {
-		if let elements::External::Function(_) = *entry.external() {
-			entry.field_mut().insert(0, '_');
+fn foreach_public_func_name<F>(mut module: elements::Module, f: F) -> elements::Module
+where F: Fn(&mut String)
+{
+	import_section(&mut module).map(|is| {
+		for entry in is.entries_mut() {
+			if let elements::External::Function(_) = *entry.external() {
+				f(entry.field_mut())
+			}
 		}
-	}
-	for entry in export_section(&mut module).expect("Import section to exist").entries_mut() {
-		if let elements::Internal::Function(_) = *entry.internal() {
-			entry.field_mut().insert(0, '_');
+	});
+
+	export_section(&mut module).map(|es| {
+		for entry in es.entries_mut() {
+			if let elements::Internal::Function(_) = *entry.internal() {
+				f(entry.field_mut())
+			}
 		}
-	}
+	});
+
 	module
 }
 
+pub fn underscore_funcs(mut module: elements::Module) -> elements::Module {
+	foreach_public_func_name(module, |n| n.insert(0, '_'))
+}
+
+
+pub fn ununderscore_funcs(mut module: elements::Module) -> elements::Module {
+	foreach_public_func_name(module, |n| { n.remove(0); })
+}
+
 pub fn externalize(
 	module: elements::Module,
 	replaced_funcs: Vec<&str>,
diff --git a/src/lib.rs b/src/lib.rs
index afdb5e1..157bbbe 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,8 +4,9 @@ extern crate byteorder;
 #[macro_use] extern crate log;
 #[macro_use] extern crate lazy_static;
 
-pub static CREATE_SYMBOL: &'static str = "_deploy";
-pub static CALL_SYMBOL: &'static str = "_call";
+pub static CREATE_SYMBOL: &'static str = "deploy";
+pub static CALL_SYMBOL: &'static str = "call";
+pub static MEMORY_SYMBOL: &'static str = "memory";
 
 pub mod rules;
 
@@ -21,8 +22,7 @@ mod runtime_type;
 pub use optimizer::{optimize, Error as OptimizerError};
 pub use gas::inject_gas_counter;
 pub use logger::init_log;
-pub use ext::{externalize, externalize_mem, underscore_funcs};
+pub use ext::{externalize, externalize_mem, underscore_funcs, ununderscore_funcs};
 pub use pack::pack_instance;
 pub use nondeterminism_check::is_deterministic;
 pub use runtime_type::inject_runtime_type;
-