Fix some small nits