Fix some bugs around