RFL crop fixes

RFL crop fixes