Changes per #3271 review