New Settings and Fixes (Canary)