Yeah, the problem's really annoying, but fortunately you can use the multi-edit feature of the Zune software to change this up. If you select songs from more than one album, just use the Edit tool and change only the Disc field (which is greyed out but should be usable). No need for third-party tools!