Getting some fixes from ss and guessit.