fix up some usage of keyinfo