Pr 600 followups

These are a few followups to #600.

/cc @oveddan