Fix history for some classes