Fix some little nits