Minor fixes on canonicalization, removing print debug