Fix a couple issues from 91c37ca1.