More class instantiation fixes