Fix local and remote deletes