Fix problems in the new deleteme stuff.