Fixed problems with cd content autodetection