Modify some declartion to avoid the warning messages while compiling