Fixes to handle python 2.6