Fixes for DGT and arduino