Corrected class instantiation errors