Fix dvd (and some minor things)