Fixed compat with upstream API changes