[FIX] Some fixes to Rabema adaption to stream module.