More cd/mpeg bug fixes