and Fixes (Canary)