Minor nits

Just to align up and downstream in prep for sync.