Fix more potential problems.
Fix the rest of the problems.