Fix classes