couple fixes to get DxIOTest passing
fixing merge conflict