Fixing concurrency issues with KB