diff --git a/platform/embedded/hci_transport_h4_embedded.c b/platform/embedded/hci_transport_h4_embedded.c
index b9a8d1959..ba81da933 100644
--- a/platform/embedded/hci_transport_h4_embedded.c
+++ b/platform/embedded/hci_transport_h4_embedded.c
@@ -255,13 +255,13 @@ static void h4_process(btstack_data_source_t *ds, btstack_data_source_callback_t
         packet_handler(HCI_EVENT_PACKET, &event[0], sizeof(event));
     }
 
-    if (h4_state != H4_PACKET_RECEIVED) return 0;
+    if (h4_state != H4_PACKET_RECEIVED) return;
             
     packet_handler(hci_packet[0], &hci_packet[1], read_pos-1);
 
     h4_init_sm();
                                 
-    return 0;
+    return;
 }
 
 static int h4_send_packet(uint8_t packet_type, uint8_t *packet, int size){
diff --git a/src/classic/hsp_ag.c b/src/classic/hsp_ag.c
index 357c04299..3e953d452 100644
--- a/src/classic/hsp_ag.c
+++ b/src/classic/hsp_ag.c
@@ -227,7 +227,7 @@ void hsp_ag_create_sdp_record(uint8_t * service, uint32_t service_record_handle,
     }
 }
 
-static int hsp_ag_send_str_over_rfcomm(uint16_t cid, char * command){
+static int hsp_ag_send_str_over_rfcomm(const uint16_t cid, char * command){
     int err = rfcomm_send(cid, (uint8_t*) command, strlen(command));
     if (err){
         log_error("rfcomm_send_internal -> error 0X%02x", err);