canonical fixes