Fixing class setup errors