Corrections for many classes..