timob-15951: small fixes