Migrate tweaks from 1.0.