Address Rob's review comments.