More robust cnonical checks