Fixes for v2.x.x
Fix const ordering