UPD: small fixes

UPD: merge with yupe/master