DA fix-ups and Dio (big pic warning)