diff --git a/src/aeso_ast_infer_types.erl b/src/aeso_ast_infer_types.erl
index ea58d01..dcd67b3 100644
--- a/src/aeso_ast_infer_types.erl
+++ b/src/aeso_ast_infer_types.erl
@@ -454,6 +454,7 @@ global_env() ->
                      {"require", Fun([Bool, String], Unit)}])
         , types = MkDefs(
                     [{"int", 0}, {"bool", 0}, {"char", 0}, {"string", 0}, {"address", 0},
+                     {"void", 0},
                      {"unit", {[], {alias_t, Unit}}},
                      {"hash", {[], {alias_t, Bytes(32)}}},
                      {"signature", {[], {alias_t, Bytes(64)}}},
@@ -476,14 +477,14 @@ global_env() ->
                      {"gas_limit",    Int},
                      {"bytecode_hash",Fun1(Address, Option(Hash))},
                      {"create",       FunCN(create,
-                                            [ {named_arg_t, Ann, {id, Ann, "value"}, Int, {int, Ann, 0}}
+                                            [ {named_arg_t, Ann, {id, Ann, "value"}, Int, {typed, Ann, {int, Ann, 0}, Int}}
                                             , {named_arg_t, Ann, {id, Ann, "code"}, A, undefined}
                                             ], var_args, A)},
                      {"clone",        FunCN(clone,
                                             [ {named_arg_t, Ann, {id, Ann, "gas"}, Int,
                                                {qid, Ann, ["Call","gas_left"]}}
-                                            , {named_arg_t, Ann, {id, Ann, "value"}, Int, {int, Ann, 0}}
-                                            , {named_arg_t, Ann, {id, Ann, "protected"}, Bool, {bool, Ann, false}}
+                                            , {named_arg_t, Ann, {id, Ann, "value"}, Int, {typed, Ann, {int, Ann, 0}, Int}}
+                                            , {named_arg_t, Ann, {id, Ann, "protected"}, Bool, {typed, Ann, {bool, Ann, false}, Bool}}
                                             , {named_arg_t, Ann, {id, Ann, "ref"}, A, undefined}
                                             ], var_args, A)},
                      %% Tx constructors
@@ -1484,9 +1485,10 @@ infer_expr(Env, {app, Ann, Fun, Args0} = App) ->
                             lists:filter(fun({named_arg_t, _, {id, _, "ref"}, _, _}) -> false; (_) -> true end, NamedArgsT),
                         {typed, _, _, InitT} =
                             infer_expr(Env, {proj, CAnn, Contract, {id, [], "init"}}),
-                        unify(Env, InitT, {fun_t, FunAnn, NamedArgsTNoRef, ArgTypes, fresh_uvar(CAnn)}, checking_init_todo),
+                        unify(Env, InitT, {fun_t, FunAnn, NamedArgsTNoRef, ArgTypes, fresh_uvar(Ann)}, checking_init_todo),
                         unify(Env, RetT, ContractT, dupadupa_todo),
-                        {fun_t, FunAnn, NamedArgsT, ArgTypes, RetT};
+                        {fun_t, Ann, NamedArgsT, ArgTypes,
+                         {if_t, Ann, {id, Ann, "protected"}, {app_t, Ann, {id, Ann, "option"}, [RetT]}, RetT}};
                     _ -> FunType0
                 end,
             GeneralResultType = fresh_uvar(Ann),
@@ -1907,6 +1909,7 @@ check_named_argument_constraint(Env,
                                     general_type = GenType,
                                     specialized_type = SpecType,
                                     context = {check_return, App} }) ->
+    io:format("CEHCK DEP: GEN ~p, SPEC: ~p\n", [GenType, SpecType]),
     NamedArgsT = dereference(NamedArgsT0),
     case dereference(NamedArgsT0) of
         [_ | _] = NamedArgsT ->
@@ -1931,6 +1934,7 @@ specialize_dependent_type(Env, Type) ->
                 {typed, _, {bool, _, false}, _} -> Else;
                 _ ->
                     type_error({named_argument_must_be_literal_bool, Arg, Val}),
+                    io:format("CHYUJ: ~p\n", [Val]),
                     fresh_uvar(aeso_syntax:get_ann(Val))
             end;
         _ -> Type   %% Currently no deep dependent types
@@ -2457,8 +2461,6 @@ occurs_check1(R, [H | T]) ->
     occurs_check(R, H) orelse occurs_check(R, T);
 occurs_check1(_, []) -> false.
 
-fresh_uvar([{origin, system}]) ->
-    error(oh_no_you_dont);
 fresh_uvar(Attrs) ->
     {uvar, Attrs, make_ref()}.
 
diff --git a/src/aeso_ast_to_fcode.erl b/src/aeso_ast_to_fcode.erl
index 58f7a54..d658309 100644
--- a/src/aeso_ast_to_fcode.erl
+++ b/src/aeso_ast_to_fcode.erl
@@ -475,6 +475,8 @@ type_to_fcode(Env, Sub, {record_t, Fields}) ->
     type_to_fcode(Env, Sub, {tuple_t, [], lists:map(FieldType, Fields)});
 type_to_fcode(_Env, _Sub, {bytes_t, _, N}) ->
     {bytes, N};
+type_to_fcode(_Env, _Sub, {tvar, Ann, "void"}) ->
+    fcode_error({found_void, Ann});
 type_to_fcode(_Env, Sub, {tvar, _, X}) ->
     maps:get(X, Sub, {tvar, X});
 type_to_fcode(_Env, _Sub, {fun_t, Ann, _, var_args, _}) ->
diff --git a/src/aeso_code_errors.erl b/src/aeso_code_errors.erl
index 6c05ff6..74bc8b1 100644
--- a/src/aeso_code_errors.erl
+++ b/src/aeso_code_errors.erl
@@ -91,6 +91,8 @@ format({var_args_not_set, Expr}) ->
     mk_err( pos(Expr), "Could not deduce type of variadic arguments"
           , "When compiling " ++ pp_expr(Expr)
           );
+format({found_void, Ann}) ->
+    mk_err(pos(Ann), "Found a void-typed value.", "`void` is a restricted, uninhabited type. Did you mean `unit`?");
 
 format(Err) ->
     mk_err(aeso_errors:pos(0, 0), io_lib:format("Unknown error: ~p\n", [Err])).
diff --git a/test/aeso_compiler_tests.erl b/test/aeso_compiler_tests.erl
index 7131076..eca7383 100644
--- a/test/aeso_compiler_tests.erl
+++ b/test/aeso_compiler_tests.erl
@@ -182,7 +182,7 @@ compilable_contracts() ->
      "protected_call",
      "hermetization_turnoff",
      "multiple_contracts",
-     "clone"
+     "clone", "clone_simple"
     ].
 
 not_compilable_on(fate) -> [];