A couple of small changes based on review comments.