Sync some fields with 0.34