Fix last tag API changes