Some more changes to Canary support