CHanges to get Python3 working