Fixed class instantiations