Fix double save issues