for matthias -- do class fixes.