Minor changes to KB handling.