Addressing nits (see emails from this morning)
Couple more nits