Small tweaks before a big change