upd: small fixes