Remove some bugs