Fix some minor nits