Fix API AHX changes