Fix some bugs
Fix