Fixed some more problems.