UPD: #949 small fixes