diff --git a/src/base/cp_annotate.hh b/src/base/cp_annotate.hh
index 9ec39b6cbc..13ced82de0 100644
--- a/src/base/cp_annotate.hh
+++ b/src/base/cp_annotate.hh
@@ -53,7 +53,7 @@ class ThreadContext;
 
 
 #if !CP_ANNOTATE
-class CPA : SimObject
+class CPA
 {
   public:
     enum flags {
diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 6240be7a21..827c1d3116 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -2495,7 +2495,7 @@ class VectorDistribution : public VectorDistBase<VectorDistribution, DistStor>
         params->min = min;
         params->max = max;
         params->bucket_size = bkt;
-        params->buckets = rint((max - min) / bkt + 1.0);
+        params->buckets = (size_type)rint((max - min) / bkt + 1.0);
         this->setParams(params);
         this->doInit(size);
         return this->self();