Fix the bugs.