Various fixes to cleanup the directory service migrations