Minor fixes to repeat state