Porting redis fixes to ooew