Fix: Start to fix some bugs