Some fixes for installation for Python 3.x