Fixing constant usage