Fix Main classes