More correct python3 support?