Fix up some issues that came up in code review.