Fixing a few problems.