Make some minor FlexCDC fixes