Mostly DCAI updates