Fix the issues.