Fix some classes