acdc_3.17: updates to get acdc working again