Update for latest Galileo changes