[PATCH] OVAL cleanup to address validation errors