Fixes from review
minor nits