Value protections so that the wrong value does not get persisted
Indentation changes