Pr 1704 followups

This is some followups to #1704.

/cc @bsnape