A few big fixes.