- Fix some bugs