Fixup client to map api2 to api