Solve 2 issues.