Fix minor nits, no functional changes