Fix the bugs due to merge