CDITCK-371 Minor improvements