UPD: small fixes