Fix some more nits