Fix warnings about redeclaring constants