Pr 1808 followups

This is some followups to #1808.

/cc @tyler-ball