Improving Multisite support; wipe on option updates/restores.