Small adjustments based on today's meeting.

@mkit