TC-1466: review fixes