Fixes for data path changes.