Sprint: More misc fixes

This includes a fix for the Py3 breakage I accidentally introduced in the last PR.