Fix some issues I spotted in the diff.