added fixes for legacy daos