diff --git a/executablecode/Makefile b/executablecode/Makefile
index 5b76fc290f0732b5b3765907fc24bb1859e63ca1..8164fce476f7081332b9f4b557b792cef0a852bd 100755
--- a/executablecode/Makefile
+++ b/executablecode/Makefile
@@ -7,10 +7,10 @@ OPT    = -O1 -pthread
 # Solaris
 #LOPT   = -O1 -pthread -ldl -lnsl -lsocket
 #Linux
-LOPT   = -O1 -pthread -ldl -lrt
+LOPT_UNIX   = -O1 -pthread -ldl -lrt
 LOPT_MAC = -O1 -pthread -ldl
 
-LOPT = $(LOPT_MAC)
+LOPT = $(LOPT_UNIX)
 
 DEBUG  = -g
 OTHER  = -Wall
diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src
index c3bde51c3ed45769343d8ad0785ed0a26f538609..0fbe662bab9bca345c7f84c99b28c340a2d931e2 100755
--- a/executablecode/Makefile.src
+++ b/executablecode/Makefile.src
@@ -1 +1 @@
-SRCS = generated_src/main.c generated_src/Block0.c 
\ No newline at end of file
+SRCS = generated_src/main.c generated_src/RemotelyControlledMicrowave.c generated_src/RemoteControl.c generated_src/MicroWaveOven.c generated_src/Bell.c generated_src/ControlPanel.c generated_src/Controller.c generated_src/Magnetron.c generated_src/Door.c generated_src/WirelessInterface.c 
\ No newline at end of file
diff --git a/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java b/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java
index 8c8c401034e6909bfccdfc832700aa3b6bb93979..e31aa6a3d3a17e66a5e07a74538668aada619829 100755
--- a/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java
+++ b/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java
@@ -243,6 +243,10 @@ public class AVATAR2CPOSIX {
 				}
 			}
 			
+			list = am.getListOfReturnAttributes();
+			if (list.size() != 0) {
+				ret += "return 0;" + CR;
+			} 
 			ret += "}" + CR + CR;
 		}
 		_taskFile.addToMainCode(ret + CR);