Quick fixes to install with python2.6