Fix 2.5 compatibility and codechecker issues.
Bump version number