CB-5360 fix compiler warnings
CB-5360 fix compiler whinings