Canary fixes