Looks good, should fix the failures