fix bugs

fix bugs for 2.0