Updates per discussion in #425