diff --git a/Makefile b/Makefile
index cdc8e02..66c3cbb 100755
--- a/Makefile
+++ b/Makefile
@@ -43,14 +43,12 @@ ifeq ($(CHAIN),ethereum)
 APP_LOAD_PARAMS += --path "44'/60'"
 DEFINES += CHAINID_UPCASE=\"ETHEREUM\" CHAINID_COINNAME=\"ETH\" CHAIN_KIND=CHAIN_KIND_ETHEREUM CHAIN_ID=0
 # Starkware integration
-APP_LOAD_PARAMS += --path "2645'/579218131'" 
+APP_LOAD_PARAMS += --path "2645'/579218131'"
 DEFINES += HAVE_STARKWARE
-DEFINES += STARK_BIP32_PATH_0=0x80000A55 STARK_BIP32_PATH_1=0xA2862AD3 
-ifeq ($(TARGET_NAME), TARGET_NANOX)
+DEFINES += STARK_BIP32_PATH_0=0x80000A55 STARK_BIP32_PATH_1=0xA2862AD3
 # Allow to derive ETH 2 public keys
-APP_LOAD_PARAMS += --path "12381/3600" --curve bls12381g1 
+APP_LOAD_PARAMS += --path "12381/3600" --curve bls12381g1
 DEFINES += HAVE_ETH2
-endif
 APPNAME = "Ethereum"
 DEFINES_LIB=
 APP_LOAD_FLAGS=--appFlags 0xa40
@@ -63,11 +61,9 @@ DEFINES += HAVE_STARKWARE
 # Keep for Starkware Ropsten tests
 DEFINES += HAVE_TOKENS_EXTRA_LIST
 DEFINES += STARK_BIP32_PATH_0=0x80000A55 STARK_BIP32_PATH_1=0xA2862AD3
-ifeq ($(TARGET_NAME), TARGET_NANOX)
 # Allow to derive ETH 2 public keys
 APP_LOAD_PARAMS += --path "12381/3600" --curve bls12381g1
 DEFINES += HAVE_ETH2
-endif
 APPNAME = "Eth Ropsten"
 DEFINES_LIB=
 APP_LOAD_FLAGS=--appFlags 0xa40
diff --git a/src/eth_plugin_ui.c b/src/eth_plugin_ui.c
index 0d1fa5a..fa126d6 100644
--- a/src/eth_plugin_ui.c
+++ b/src/eth_plugin_ui.c
@@ -79,7 +79,7 @@ void display_next_plugin_item(bool entering) {
                 // Reset multi page layout to the first page
                 G_ux.layout_paging.current = 0;
 #ifdef TARGET_NANOS
-                ux_layout_paging_redisplay(G_ux.stack_count - 1);
+                ux_layout_paging_redisplay_by_addr(G_ux.stack_count - 1);
 #else
                 ux_layout_bnnn_paging_redisplay(0);
 #endif
diff --git a/src/ui_callbacks.h b/src/ui_callbacks.h
index 5fc97a9..26702bc 100644
--- a/src/ui_callbacks.h
+++ b/src/ui_callbacks.h
@@ -1,4 +1,5 @@
 #include "shared_context.h"
+#include "ux.h"
 
 unsigned int io_seproxyhal_touch_settings(const bagl_element_t *e);
 unsigned int io_seproxyhal_touch_exit(const bagl_element_t *e);
diff --git a/src/ui_flow.h b/src/ui_flow.h
index 4e8f321..927f5e2 100644
--- a/src/ui_flow.h
+++ b/src/ui_flow.h
@@ -1,6 +1,7 @@
 #include "shared_context.h"
 
 #include "os_io_seproxyhal.h"
+#include "ux.h"
 
 extern const ux_flow_step_t* const ux_idle_flow[];