Canonical fixes