Update for recent fruit-loops changes