Fixes for arduino compiler