Fix the problems