Fix Python 3 compatibility issues