diff --git a/platform/embedded/btstack_run_loop_embedded.c b/platform/embedded/btstack_run_loop_embedded.c
index 55be08f77..6bc48dd57 100644
--- a/platform/embedded/btstack_run_loop_embedded.c
+++ b/platform/embedded/btstack_run_loop_embedded.c
@@ -273,13 +273,13 @@ uint32_t btstack_run_loop_embedded_ticks_for_ms(uint32_t time_in_ms){
 #endif
 
 static uint32_t btstack_run_loop_embedded_get_time_ms(void){
-#ifdef HAVE_EMBEDDED_TIME_MS
+#if   defined(HAVE_EMBEDDED_TIME_MS)
     return hal_time_ms();
-#endif
-#ifdef HAVE_EMBEDDED_TICK
+#elif defined(HAVE_EMBEDDED_TICK)
     return system_ticks * hal_tick_get_tick_period_in_ms();
-#endif
+#else
     return 0;
+#endif
 }
 
 
diff --git a/src/hci_transport_h5.c b/src/hci_transport_h5.c
index 45007234b..510d67d66 100644
--- a/src/hci_transport_h5.c
+++ b/src/hci_transport_h5.c
@@ -834,7 +834,6 @@ static int hci_transport_h5_open(void){
 
 static int hci_transport_h5_close(void){
     return btstack_uart->close();
-    return 0;
 }
 
 static void hci_transport_h5_register_packet_handler(void (*handler)(uint8_t packet_type, uint8_t *packet, uint16_t size)){