Fixed up some python3 updates