Minor things I missed in my earlier commit to make things compatible with merging upstream