Constants fixes
Merge branch 'constants'