Various changes and fixes

Removed demuxer commit.