Minor changes per review comments.