Added in ID for Canary (on mac)
A few Canary fixes