diff --git a/trunk/c5/integer.cpp b/trunk/c5/integer.cpp
index 3c94b530..7e8e3f8c 100644
--- a/trunk/c5/integer.cpp
+++ b/trunk/c5/integer.cpp
@@ -35,7 +35,7 @@ static int DummyAssignIntToInteger = (AssignIntToInteger = FunctionAssignIntToIn
 
 #ifdef SSE2_INTRINSICS_AVAILABLE
 template <class T>
-AllocatorBase<T>::pointer AlignedAllocator<T>::allocate(size_type n, const void *)
+CPP_TYPENAME AllocatorBase<T>::pointer AlignedAllocator<T>::allocate(size_type n, const void *)
 {
 	if (n < 4)
 		return new T[n];
diff --git a/trunk/c5/pubkey.h b/trunk/c5/pubkey.h
index a31d5366..a5fb704e 100644
--- a/trunk/c5/pubkey.h
+++ b/trunk/c5/pubkey.h
@@ -747,13 +747,13 @@ void DL_PublicKey<T>::AssignFrom(const NameValuePairs &source)
 class OID;
 
 //! .
-template <class PK, class GP>
+template <class PK, class GP, class O = OID>
 class DL_KeyImpl : public PK
 {
 public:
 	typedef GP GroupParameters;
 
-	OID GetAlgorithmID() const {return GetGroupParameters().GetAlgorithmID();}
+	O GetAlgorithmID() const {return GetGroupParameters().GetAlgorithmID();}
 //	void BERDecode(BufferedTransformation &bt)
 //		{PK::BERDecode(bt);}
 //	void DEREncode(BufferedTransformation &bt) const
diff --git a/trunk/c5/test.cpp b/trunk/c5/test.cpp
index 964eabb0..e9d66c61 100644
--- a/trunk/c5/test.cpp
+++ b/trunk/c5/test.cpp
@@ -695,7 +695,7 @@ void InformationDisperseFile(int threshold, int nShares, const char *filename)
 
 	vector_member_ptrs<FileSink> fileSinks(nShares);
 	string channel;
-	for (unsigned int i=0; i<nShares; i++)
+	for (int i=0; i<nShares; i++)
 	{
 		char extension[5] = ".000";
 		extension[1]='0'+byte(i/100);
@@ -719,7 +719,7 @@ void InformationRecoverFile(int threshold, const char *outFilename, char *const
 
 	vector_member_ptrs<FileSource> fileSources(threshold);
 	SecByteBlock channel(4);
-	unsigned int i;
+	int i;
 	for (i=0; i<threshold; i++)
 	{
 		fileSources[i].reset(new FileSource(inFilenames[i], false));