diff --git a/Makefile b/Makefile
index 89f11e0..ec2993a 100644
--- a/Makefile
+++ b/Makefile
@@ -39,12 +39,12 @@ indice.json: src/indice/main.mligo
 advisor.tz: src/advisor/main.mligo
 	@mkdir -p compiled
 	@echo "Compiling Advisor smart contract to Michelson"
-	@$(ligo_compiler) compile contract $^ -e advisorMain $(protocol_opt) > compiled/$@
+	@$(ligo_compiler) compile contract $^ $(protocol_opt) > compiled/$@
 
 advisor.json: src/advisor/main.mligo
 	@mkdir -p compiled
 	@echo "Compiling Advisor smart contract to Michelson in JSON format"
-	@$(ligo_compiler) compile contract $^ $(JSON_OPT) -e advisorMain $(protocol_opt) > compiled/$@
+	@$(ligo_compiler) compile contract $^ $(JSON_OPT) $(protocol_opt) > compiled/$@
 
 clean:
 	@echo "Removing Michelson files"
diff --git a/src/advisor/main.mligo b/src/advisor/main.mligo
index 3975fa1..2b2d92e 100644
--- a/src/advisor/main.mligo
+++ b/src/advisor/main.mligo
@@ -6,7 +6,8 @@ type storage = Storage.Types.t
 type parameter = Parameter.Types.t
 type return = operation list * storage
 
-let advisorMain(ep, store : Parameter.Types.t * Storage.Types.t) : return = 
+[@entry]
+let advisorMain (ep : Parameter.Types.t) (store : Storage.Types.t) : return = 
     ([] : operation list), (match ep with
     | ChangeAlgorithm(p) -> Storage.Utils.change(p, store)
     | ExecuteAlgorithm(_p) -> Storage.Utils.executeAlgorithm(store) 
diff --git a/src/indice/main.mligo b/src/indice/main.mligo
index 1bdb529..bf8d3ac 100644
--- a/src/indice/main.mligo
+++ b/src/indice/main.mligo
@@ -16,9 +16,11 @@ let increment(param, store : int * storage) : return =
 let decrement(param, store : int * storage) : return = 
     (([]: operation list), store - param)
 
-let indiceMain(ep, store : parameter * storage) : return =
+[@entry]
+let indiceMain (ep : parameter) (store : storage) : return =
     match ep with 
     | Increment(p) -> increment(p, store)
     | Decrement(p) -> decrement(p, store)
 
-[@view] let indice_value(_params, store: unit * storage): int = store
\ No newline at end of file
+[@view] 
+let indice_value (_params : unit) (store: storage) : int = store
\ No newline at end of file