Data repeater fixes