Finished adding python3 support corrections