Fix canonicals