This wraps up the ctdlmigrate fixes.