[TAC-156] some little changes