Fix many bug