Repeater mixin fixes