diff --git a/src/aeso_ast_to_fcode.erl b/src/aeso_ast_to_fcode.erl
index 5da40e0..f519be0 100644
--- a/src/aeso_ast_to_fcode.erl
+++ b/src/aeso_ast_to_fcode.erl
@@ -31,7 +31,9 @@
               map_get | map_get_d | map_set | map_from_list | map_to_list |
               map_delete | map_member | map_size | string_length |
               string_concat | bits_set | bits_clear | bits_test | bits_sum |
-              bits_intersection | bits_union | bits_difference | contract_address.
+              bits_intersection | bits_union | bits_difference |
+              contract_address | crypto_ecverify | crypto_ecverify_secp256k1 |
+              crypto_sha3 | crypto_sha256 | crypto_blake2b.
 
 -type flit() :: {int, integer()}
               | {string, binary()}
@@ -315,8 +317,10 @@ type_to_fcode(Env, Sub, {tuple_t, _, Types}) ->
 type_to_fcode(Env, Sub, {record_t, Fields}) ->
     FieldType = fun({field_t, _, _, Ty}) -> Ty end,
     type_to_fcode(Env, Sub, {tuple_t, [], lists:map(FieldType, Fields)});
+type_to_fcode(_Env, _Sub, {bytes_t, _, 32}) -> hash;
+type_to_fcode(_Env, _Sub, {bytes_t, _, 64}) -> signature;
 type_to_fcode(_Env, _Sub, {bytes_t, _, _N}) ->
-    string; %% TODO: add bytes type to FATE?
+    string; %% TODO: add bytes type to FATE
 type_to_fcode(_Env, Sub, {tvar, _, X}) ->
     maps:get(X, Sub, {tvar, X});
 type_to_fcode(Env, Sub, {fun_t, _, Named, Args, Res}) ->
@@ -758,7 +762,8 @@ op_builtins() ->
     [map_from_list, map_to_list, map_delete, map_member, map_size,
      string_length, string_concat, string_sha3, string_sha256, string_blake2b,
      bits_set, bits_clear, bits_test, bits_sum, bits_intersection, bits_union,
-     bits_difference, int_to_str, address_to_str].
+     bits_difference, int_to_str, address_to_str, crypto_ecverify,
+     crypto_ecverify_secp256k1, crypto_sha3, crypto_sha256, crypto_blake2b].
 
 builtin_to_fcode(map_delete, [Key, Map]) ->
     {op, map_delete, [Map, Key]};
diff --git a/src/aeso_fcode_to_fate.erl b/src/aeso_fcode_to_fate.erl
index d20a8b9..7b5eb9d 100644
--- a/src/aeso_fcode_to_fate.erl
+++ b/src/aeso_fcode_to_fate.erl
@@ -491,16 +491,6 @@ builtin_to_scode(_Env, aens_transfer, [_, _, _, _] = _Args) ->
     ?TODO(fate_aens_transfer_instruction);
 builtin_to_scode(_Env, aens_revoke, [_, _, _] = _Args) ->
     ?TODO(fate_aens_revoke_instruction);
-builtin_to_scode(_Env, crypto_ecverify, [_, _, _] = _Args) ->
-    ?TODO(fate_crypto_ecverify_instruction);
-builtin_to_scode(_Env, crypto_ecverify_secp256k1, [_, _, _] = _Args) ->
-    ?TODO(fate_crypto_ecverify_secp256k1_instruction);
-builtin_to_scode(_Env, crypto_sha3, [_] = _Args) ->
-    ?TODO(fate_crypto_sha3_instruction);
-builtin_to_scode(_Env, crypto_sha256, [_] = _Args) ->
-    ?TODO(fate_crypto_sha256_instruction);
-builtin_to_scode(_Env, crypto_blake2b, [_] = _Args) ->
-    ?TODO(fate_crypto_blake2b_instruction);
 builtin_to_scode(_Env, auth_tx_hash, []) ->
     ?TODO(fate_auth_tx_hash_instruction).
 
@@ -540,7 +530,12 @@ op_to_scode(bits_union)        -> aeb_fate_ops:bits_or(?a, ?a, ?a);
 op_to_scode(bits_difference)   -> aeb_fate_ops:bits_diff(?a, ?a, ?a);
 op_to_scode(address_to_str)    -> aeb_fate_ops:addr_to_str(?a, ?a);
 op_to_scode(int_to_str)        -> aeb_fate_ops:int_to_str(?a, ?a);
-op_to_scode(contract_address)  -> ?TODO(fate_contract_to_address_conversion).
+op_to_scode(contract_address)          -> ?TODO(fate_contract_to_address_conversion);
+op_to_scode(crypto_ecverify)           -> aeb_fate_ops:ecverify(?a, ?a, ?a, ?a);
+op_to_scode(crypto_ecverify_secp256k1) -> aeb_fate_ops:ecverify_secp256k1(?a, ?a, ?a, ?a);
+op_to_scode(crypto_sha3)               -> aeb_fate_ops:sha3(?a, ?a);
+op_to_scode(crypto_sha256)             -> aeb_fate_ops:sha256(?a, ?a);
+op_to_scode(crypto_blake2b)            -> aeb_fate_ops:blake2b(?a, ?a).
 
 %% PUSH and STORE ?a are the same, so we use STORE to make optimizations
 %% easier, and specialize to PUSH (which is cheaper) at the end.