DIO Build error fixes round 2