params and globals improvements and clean-up for 2.6 support