Changes per #3324 review