Merge pull request #559 from gameblabla/cdrom_various_fixes