Misc KBase fixes