Fix some cut'n'paste issues.