ARRAY-2666: review fixes