Corrected a few classes