Fixes for PR review.