[kb] Multiple problems fixed