Fix canonicalization of core modules