Added measures to prevent the need for a data wipe.