Fixing class stuff