Finish fixing nits that were missed on the first pass