fix bugs and 2.6 compatibility
4 files changed