Fix: fix some bugs