fixes in a constant def
Merge branch 'development'