Minor

Various small fixes to use of constants