fix some overly narrow type instantiations