More python3 compatability