Minor Python3 compatibility changes.