more dpat fixes