Minor changes before the big change.