1996 Commits (fix/canonicals)