Main class corrections