FDG fixes after Flock upgrade