Small fixes to run amca without discharges