diff --git a/validate/gst/qa/gst-qa-report.h b/validate/gst/qa/gst-qa-report.h
index bf1bf6fa0e..b02e26cd3d 100644
--- a/validate/gst/qa/gst-qa-report.h
+++ b/validate/gst/qa/gst-qa-report.h
@@ -57,33 +57,35 @@ typedef enum {
   GST_QA_AREA_OTHER=100,
 } GstQaReportArea;
 
-typedef guint64 GstQaIssueId;
+typedef guintptr GstQaIssueId;
 #define GST_QA_ISSUE_ID_UNKNOWN 0
 
-#define GST_QA_ISSUE_ID_BUFFER_BEFORE_SEGMENT                    (((guint64) GST_QA_AREA_BUFFER) << 32 | 1)
-#define GST_QA_ISSUE_ID_BUFFER_IS_OUT_OF_SEGMENT                 (((guint64) GST_QA_AREA_BUFFER) << 32 | 2)
-#define GST_QA_ISSUE_ID_BUFFER_TIMESTAMP_OUT_OF_RECEIVED_RANGE   (((guint64) GST_QA_AREA_BUFFER) << 32 | 3)
-#define GST_QA_ISSUE_ID_FIRST_BUFFER_RUNNING_TIME_IS_NOT_ZERO    (((guint64) GST_QA_AREA_BUFFER) << 32 | 4)
-#define GST_QA_ISSUE_ID_WRONG_FLOW_RETURN                        (((guint64) GST_QA_AREA_BUFFER) << 32 | 5)
+#define GST_QA_ISSUE_ID_SHIFT 16
 
-#define GST_QA_ISSUE_ID_CAPS_IS_MISSING_FIELD         (((guint64) GST_QA_AREA_CAPS) << 32 | 1)
-#define GST_QA_ISSUE_ID_CAPS_FIELD_HAS_BAD_TYPE       (((guint64) GST_QA_AREA_CAPS) << 32 | 2)
-#define GST_QA_ISSUE_ID_CAPS_EXPECTED_FIELD_NOT_FOUND (((guint64) GST_QA_AREA_CAPS) << 32 | 3)
-#define GST_QA_ISSUE_ID_GET_CAPS_NOT_PROXYING_FIELDS  (((guint64) GST_QA_AREA_CAPS) << 32 | 4)
-#define GST_QA_ISSUE_ID_CAPS_FIELD_UNEXPECTED_VALUE   (((guint64) GST_QA_AREA_CAPS) << 32 | 5)
+#define GST_QA_ISSUE_ID_BUFFER_BEFORE_SEGMENT                    (((GstQaIssueId) GST_QA_AREA_BUFFER) << GST_QA_ISSUE_ID_SHIFT | 1)
+#define GST_QA_ISSUE_ID_BUFFER_IS_OUT_OF_SEGMENT                 (((GstQaIssueId) GST_QA_AREA_BUFFER) << GST_QA_ISSUE_ID_SHIFT | 2)
+#define GST_QA_ISSUE_ID_BUFFER_TIMESTAMP_OUT_OF_RECEIVED_RANGE   (((GstQaIssueId) GST_QA_AREA_BUFFER) << GST_QA_ISSUE_ID_SHIFT | 3)
+#define GST_QA_ISSUE_ID_FIRST_BUFFER_RUNNING_TIME_IS_NOT_ZERO    (((GstQaIssueId) GST_QA_AREA_BUFFER) << GST_QA_ISSUE_ID_SHIFT | 4)
+#define GST_QA_ISSUE_ID_WRONG_FLOW_RETURN                        (((GstQaIssueId) GST_QA_AREA_BUFFER) << GST_QA_ISSUE_ID_SHIFT | 5)
 
-#define GST_QA_ISSUE_ID_EVENT_NEWSEGMENT_NOT_PUSHED           (((guint64) GST_QA_AREA_EVENT) << 32 | 1)
-#define GST_QA_ISSUE_ID_SERIALIZED_EVENT_WASNT_PUSHED_IN_TIME (((guint64) GST_QA_AREA_EVENT) << 32 | 2)
-#define GST_QA_ISSUE_ID_EVENT_HAS_WRONG_SEQNUM                (((guint64) GST_QA_AREA_EVENT) << 32 | 3)
-#define GST_QA_ISSUE_ID_EVENT_SERIALIZED_OUT_OF_ORDER         (((guint64) GST_QA_AREA_EVENT) << 32 | 4)
-#define GST_QA_ISSUE_ID_EVENT_NEW_SEGMENT_MISMATCH            (((guint64) GST_QA_AREA_EVENT) << 32 | 5)
-#define GST_QA_ISSUE_ID_EVENT_FLUSH_START_UNEXPECTED          (((guint64) GST_QA_AREA_EVENT) << 32 | 6)
-#define GST_QA_ISSUE_ID_EVENT_FLUSH_STOP_UNEXPECTED           (((guint64) GST_QA_AREA_EVENT) << 32 | 7)
+#define GST_QA_ISSUE_ID_CAPS_IS_MISSING_FIELD         (((GstQaIssueId) GST_QA_AREA_CAPS) << GST_QA_ISSUE_ID_SHIFT | 1)
+#define GST_QA_ISSUE_ID_CAPS_FIELD_HAS_BAD_TYPE       (((GstQaIssueId) GST_QA_AREA_CAPS) << GST_QA_ISSUE_ID_SHIFT | 2)
+#define GST_QA_ISSUE_ID_CAPS_EXPECTED_FIELD_NOT_FOUND (((GstQaIssueId) GST_QA_AREA_CAPS) << GST_QA_ISSUE_ID_SHIFT | 3)
+#define GST_QA_ISSUE_ID_GET_CAPS_NOT_PROXYING_FIELDS  (((GstQaIssueId) GST_QA_AREA_CAPS) << GST_QA_ISSUE_ID_SHIFT | 4)
+#define GST_QA_ISSUE_ID_CAPS_FIELD_UNEXPECTED_VALUE   (((GstQaIssueId) GST_QA_AREA_CAPS) << GST_QA_ISSUE_ID_SHIFT | 5)
 
-#define GST_QA_ISSUE_ID_EVENT_SEEK_NOT_HANDLED           (((guint64) GST_QA_AREA_SEEK) << 32 | 1)
-#define GST_QA_ISSUE_ID_EVENT_SEEK_RESULT_POSITION_WRONG (((guint64) GST_QA_AREA_SEEK) << 32 | 2)
+#define GST_QA_ISSUE_ID_EVENT_NEWSEGMENT_NOT_PUSHED           (((GstQaIssueId) GST_QA_AREA_EVENT) << GST_QA_ISSUE_ID_SHIFT | 1)
+#define GST_QA_ISSUE_ID_SERIALIZED_EVENT_WASNT_PUSHED_IN_TIME (((GstQaIssueId) GST_QA_AREA_EVENT) << GST_QA_ISSUE_ID_SHIFT | 2)
+#define GST_QA_ISSUE_ID_EVENT_HAS_WRONG_SEQNUM                (((GstQaIssueId) GST_QA_AREA_EVENT) << GST_QA_ISSUE_ID_SHIFT | 3)
+#define GST_QA_ISSUE_ID_EVENT_SERIALIZED_OUT_OF_ORDER         (((GstQaIssueId) GST_QA_AREA_EVENT) << GST_QA_ISSUE_ID_SHIFT | 4)
+#define GST_QA_ISSUE_ID_EVENT_NEW_SEGMENT_MISMATCH            (((GstQaIssueId) GST_QA_AREA_EVENT) << GST_QA_ISSUE_ID_SHIFT | 5)
+#define GST_QA_ISSUE_ID_EVENT_FLUSH_START_UNEXPECTED          (((GstQaIssueId) GST_QA_AREA_EVENT) << GST_QA_ISSUE_ID_SHIFT | 6)
+#define GST_QA_ISSUE_ID_EVENT_FLUSH_STOP_UNEXPECTED           (((GstQaIssueId) GST_QA_AREA_EVENT) << GST_QA_ISSUE_ID_SHIFT | 7)
 
-#define GST_QA_ISSUE_ID_AREA(id) ((guint32)(id >> 32))
+#define GST_QA_ISSUE_ID_EVENT_SEEK_NOT_HANDLED           (((GstQaIssueId) GST_QA_AREA_SEEK) << GST_QA_ISSUE_ID_SHIFT | 1)
+#define GST_QA_ISSUE_ID_EVENT_SEEK_RESULT_POSITION_WRONG (((GstQaIssueId) GST_QA_AREA_SEEK) << GST_QA_ISSUE_ID_SHIFT | 2)
+
+#define GST_QA_ISSUE_ID_AREA(id) ((guintptr)(id >> GST_QA_ISSUE_ID_SHIFT))
 
 typedef struct {
   GstQaIssueId issue_id;
@@ -126,7 +128,7 @@ typedef struct {
   gchar *message;
 } GstQaReport;
 
-#define GST_QA_ISSUE_FORMAT G_GUINT64_FORMAT " (%s) : %s(%u): %s"
+#define GST_QA_ISSUE_FORMAT G_GUINTPTR_FORMAT " (%s) : %s(%u): %s"
 #define GST_QA_ISSUE_ARGS(i) gst_qa_issue_get_id (i), gst_qa_report_level_get_name (i->default_level), \
                              gst_qa_report_area_get_name (GST_QA_ISSUE_AREA (i)), GST_QA_ISSUE_AREA (i), \
                              i->summary