Fixes for python 2.6