Repeater fixes