Minor big fixes.