Media2Zero fixes