ID-244 fixes