Fixed some old instantiations with the wrong tyopes