ARQ-1871 Minor changes based on review.