Fix many stuffs