Tweaks to support Python 2.6