diff --git a/runtime/Makefile b/runtime/Makefile
index 9538ed7..3b4e15f 100644
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -12,8 +12,7 @@ CC_OPTIONS = -O3 -flto -g -pthread -D_GNU_SOURCE
 BINARY_NAME=sledgert
 
 # Number of Cores. Options: {2...N or TOTAL_CORES}
-# NCORES = ${TOTAL_CORES}
-NCORES = 2
+NCORES = ${TOTAL_CORES}
 
 # Options: {USE_MEM_GENERIC, USE_MEM_VM}
 USE_MEM = USE_MEM_VM
@@ -21,10 +20,10 @@ USE_MEM = USE_MEM_VM
 # Debugging Flags
 
 # Strips out calls to assert()
-# CFLAGS += -DNDEBUG
+CFLAGS += -DNDEBUG
 
 # Turns on debuglog and other assorted printfs in third party libs
-CFLAGS += -DDEBUG
+# CFLAGS += -DDEBUG
 
 # Redirects debuglogs to /runtime/bin/awesome.log 
 #FIXME This log should be changed to sledge.log (and likely to a user defined path)