ACRE fixes

- ACRE fixes from Cam