Make minor (and compatible) changes to KFS