Add: Python3 compatibility fixes