Fixes registration from onLoad and onSave, enforces dead state.