Fix API changes with AHC