diff --git a/gtsam_unstable/discrete/CSP.cpp b/gtsam_unstable/discrete/CSP.cpp
index 10c27d2bb..bfbdf28cf 100644
--- a/gtsam_unstable/discrete/CSP.cpp
+++ b/gtsam_unstable/discrete/CSP.cpp
@@ -60,8 +60,8 @@ namespace gtsam {
 			// TODO: Sudoku specific hack
 			if (print) {
 				if (cardinality == 9 && n == 81) {
-					for (size_t i = 0, v = 0; i < sqrt(n); i++) {
-						for (size_t j = 0; j < sqrt(n); j++, v++) {
+					for (size_t i = 0, v = 0; i < (size_t)sqrt(double(n)); i++) {
+						for (size_t j = 0; j < (size_t)sqrt(double(n)); j++, v++) {
 							if (changed[v]) cout << "*";
 							domains[v].print();
 							cout << "\t";
diff --git a/gtsam_unstable/discrete/tests/testSudoku.cpp b/gtsam_unstable/discrete/tests/testSudoku.cpp
index 583364ade..a32ca2645 100644
--- a/gtsam_unstable/discrete/tests/testSudoku.cpp
+++ b/gtsam_unstable/discrete/tests/testSudoku.cpp
@@ -75,7 +75,7 @@ public:
 		}
 
 		// add box constraints
-		size_t N = sqrt(n), i0 = 0;
+		size_t N = (size_t)sqrt(double(n)), i0 = 0;
 		for (size_t I = 0; I < N; I++) {
 			size_t j0 = 0;
 			for (size_t J = 0; J < N; J++) {