Fixed some Disc source bugs.