Get rid of re-initialized constant warnings in production