Fix a few moment issues with recurrence.
#MBL-10158 Fixed