Return APIv1 fixes to avoid test errors