fix modules and 2.6 compatibility
28 files changed