Be more careful about saving changes on different threads