Fixes to work on Canary