More fixes

CD/mpeg fixes