Updates to AMD wrappers to support ACE properly