Fixed a few problems.