Fix the small bugs.