Extra Python 3 support

This adds a couple more missing bits for python 3 support.