Fixing class constructors