Fixing issues for releasing a 2.6 compatible version