EBeye export fixes