Change field type values for compatibility with upstream