Today
Fix compile (some fields got stomped because these weren't in sync)