Fix up Python3 support