Fix data manager add/remove routines.