[++][FIX][MajorBugs] Fix major bugs