Update datwatcher references for 1.8 module
Other updates to dependency interactions