Fixes for py26