Fixing review comments.