Modify some compiling errors & warnings