Fix some bugs, but bugs still exist