Fixed a few classes