Minor fixes
Trying to make constants more visible