Fixed several class uses