Fix MessageChannel implementation
Update Shifter to avoid issues in older versions