Fix two new issues discovered in code review.