Bug fixes to updating during reset/default load