Fix a few issues from the initial review.