Fixes to the repeater.