Changes per #3361 review