Making more python3 compatible.