Fixed some class-loading errors.