Fix some Redefine warning