Fix instantiation errors