Fixes for py26 and py33.