Fixed more problems.