Fix more issues.