Fix use of constants