diff --git a/src/gd_v_devman.erl b/src/gd_v_devman.erl
index 98abb7a..1d1b440 100644
--- a/src/gd_v_devman.erl
+++ b/src/gd_v_devman.erl
@@ -1227,7 +1227,8 @@ close_instance(State = #s{cons = {Consbook, Pages}, buttons = Buttons}) ->
             State;
         Index ->
             {#c{funs = {_, IFaces}}, NewPages} = take_nth(Index + 1, Pages),
-            IDs = list_iface_buttons(IFaces),
+            log(info, "IFaces: ~tp", [IFaces]),
+            IDs = list_iface_buttons(maps:values(IFaces)),
             NewButtons = maps:without(IDs, Buttons),
             true = wxNotebook:deletePage(Consbook, Index),
             State#s{cons = {Consbook, NewPages}, buttons = NewButtons}
@@ -1248,7 +1249,7 @@ compile(Source) ->
     case so_compiler:from_string(Source, Options) of
         {ok, Build} ->
             ACI = maps:get(aci, Build),
-            AACI = hz:prepare_aaci(ACI),
+            AACI = hz_aaci:prepare(ACI),
             Complete = maps:put(aaci, AACI, Build),
             {ok, Complete};
         Other ->