Further Python 2.6 compatibilty fixes