Updates from code review.

AFDP-111