CONN-1513: Review comment fixes