Fixes to regressions in ATR