WIP for next version of Fly and fix for change in CanaryUtil