Changes per #3268 review