Changes to get Umich's keyword framework working with 2.9