Fixed demultiplexing issues
Fixes to mmp