fixes to ensure the incremented values get saved