A few more kb_base fixups