Fixed some more repeater problems