diff --git a/TestScripts/coverity-linux.txt b/TestScripts/coverity-linux.txt
index df373ee1..b6805af6 100644
--- a/TestScripts/coverity-linux.txt
+++ b/TestScripts/coverity-linux.txt
@@ -20,7 +20,7 @@ CXXFLAGS="-DNDEBUG -g2 -O3 -march=i686 -msse -msse2 -msse3 -mssse3 -mno-aes" cov
 
 tar czvf cryptopp.tgz cov-int
 
-set CRYPTOPP_COVERITY_TOKEN=XXXXXXXXXXXXXXXX
+CRYPTOPP_COVERITY_TOKEN=XXXXXXXXXXXXXXXX
 COVERITY_SCAN_NAME="Rijndael-AliasedTable-SSE2-Linux-i686"
 
 curl
diff --git a/integer.cpp b/integer.cpp
index 25ba6ada..949d6890 100644
--- a/integer.cpp
+++ b/integer.cpp
@@ -3013,17 +3013,20 @@ struct NewInteger
 
 const Integer &Integer::Zero()
 {
-	return Singleton<Integer>().Ref();
+	static const Integer& s_zero = Singleton<Integer>().Ref();
+	return s_zero;
 }
 
 const Integer &Integer::One()
 {
-	return Singleton<Integer, NewInteger<1> >().Ref();
+	static const Integer& s_one = Singleton<Integer, NewInteger<1> >().Ref();
+	return s_one;
 }
 
 const Integer &Integer::Two()
 {
-	return Singleton<Integer, NewInteger<2> >().Ref();
+	static const Integer& s_two = Singleton<Integer, NewInteger<2> >().Ref();
+	return s_two;
 }
 
 bool Integer::operator!() const