Fixed a bit class things