diff --git a/src/aeb_fate_data.erl b/src/aeb_fate_data.erl
index 0568193..d7bfef7 100644
--- a/src/aeb_fate_data.erl
+++ b/src/aeb_fate_data.erl
@@ -205,7 +205,7 @@ format(?FATE_VARIANT(Size, Tag, T)) ->
      " |)"];
 format(M) when ?IS_FATE_MAP(M) ->
     ["{ ", format_kvs(maps:to_list(?FATE_MAP_VALUE(M))), " }"];
-format(?FATE_ADDRESS(Address))  -> [address_to_base58(Address)];
+format(?FATE_ADDRESS(Address))  -> ["@", address_to_base58(Address)];
 format(?FATE_HASH(X))           -> ["#", base64:encode(X)];
 format(?FATE_SIGNATURE(X))      -> ["$", base64:encode(X)];
 format(?FATE_CONTRACT(X))       -> ["ct_", address_to_base58(X)];
diff --git a/src/aeb_fate_encoding.erl b/src/aeb_fate_encoding.erl
index 8a3656a..7b68826 100644
--- a/src/aeb_fate_encoding.erl
+++ b/src/aeb_fate_encoding.erl
@@ -218,7 +218,7 @@ deserialize_type(<<?TYPE_LIST, Rest/binary>>) ->
 deserialize_type(<<?TYPE_TUPLE, N, Rest/binary>>) ->
     {Ts, Rest2} = deserialize_types(N, Rest, []),
     {{tuple, Ts}, Rest2};
-deserialize_type(<<TYPE_OBJECT, ObjectType, Rest/binary>>) ->
+deserialize_type(<<?TYPE_OBJECT, ObjectType, Rest/binary>>) ->
     case ObjectType of
         ?OTYPE_ADDRESS   -> {address, Rest};
         ?OTYPE_HASH      -> {hash, Rest};
diff --git a/test/asm_code/all_instructions.fate b/test/asm_code/all_instructions.fate
index 51d0d29..82ca2e4 100644
--- a/test/asm_code/all_instructions.fate
+++ b/test/asm_code/all_instructions.fate
@@ -24,7 +24,7 @@ FUNCTION foo () : {tuple, []}
 
   SWITCH_V3 var4 0x1d61723dd 79 7
 
-  SWITCH_VN #nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv [1, 2, 3]
+  SWITCH_VN arg0 [1, 2, 3]
 
   PUSH var80
 
@@ -112,7 +112,7 @@ FUNCTION foo () : {tuple, []}
 
   ADDR_TO_STR a arg216
 
-  STR_REVERSE a174 #nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv
+  STR_REVERSE a174 @nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv
 
   INT_TO_ADDR arg127 var207
 
@@ -180,11 +180,11 @@ FUNCTION foo () : {tuple, []}
 
   LOG3 arg255 arg15 arg211 var139 arg44
 
-  LOG4 #nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv a247 a 9 a38 a
+  LOG4 @nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv a247 a 9 a38 a
 
   DEACTIVATE
 
-  SPEND #nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv var136
+  SPEND @nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv var136
 
   ORACLE_REGISTER arg29 48 ((| 5 | 2 | (1, "foo", ()) |)) arg65 { <> => false} <>