timob-12176: address minor comments