eb-repeat bug fixes