More legacy tweaks.