Further Python 2.6 compatibility fixes