two missing fixes that got pushed into the wrong branch.

Whoops!