Various fixes for PR review.