More work on canary support.