Minor rework of constants