Fix guards for qecvt