Fixing instantiations