Fix some bugs found during these 1 month