arduino engine fixes