Fixes for communication with Arduino & Android