Fix issues KB-123131