diff --git a/Eigen/src/QR/SelfAdjointEigenSolver.h b/Eigen/src/QR/SelfAdjointEigenSolver.h
index 6d3bdf005..607640e23 100644
--- a/Eigen/src/QR/SelfAdjointEigenSolver.h
+++ b/Eigen/src/QR/SelfAdjointEigenSolver.h
@@ -52,8 +52,8 @@ template<typename _MatrixType> class SelfAdjointEigenSolver
     typedef Tridiagonalization<MatrixType> TridiagonalizationType;
 
     SelfAdjointEigenSolver()
-        : m_eivec(Size, Size),
-          m_eivalues(Size)
+        : m_eivec(int(Size), int(Size)),
+          m_eivalues(int(Size))
     {
       ei_assert(Size!=Dynamic);
     }
diff --git a/test/triangular.cpp b/test/triangular.cpp
index a74ca5e0b..3183b8b73 100644
--- a/test/triangular.cpp
+++ b/test/triangular.cpp
@@ -81,7 +81,7 @@ template<typename MatrixType> void triangular(const MatrixType& m)
   m1.template part<Eigen::LowerTriangular>() = (m2.transpose() * m2).lazy();
   VERIFY_IS_APPROX(m3.template part<Eigen::LowerTriangular>(), m1);
 
-  VERIFY_IS_APPROX(m3.template part<Diagonal>(), m3.diagonal().asDiagonal());
+  VERIFY_IS_APPROX(m3.template part<DiagonalBits>(), m3.diagonal().asDiagonal());
 
   m1 = MatrixType::Random(rows, cols);
   for (int i=0; i<rows; ++i)