Fixup issues found in review.