Fixing a few problem areas.