diff --git a/vmime/address.hpp b/vmime/address.hpp
index 188d6ec4..db5a2384 100644
--- a/vmime/address.hpp
+++ b/vmime/address.hpp
@@ -41,8 +41,6 @@ namespace vmime
 
 class address : public headerFieldValue
 {
-	friend class addressList;
-
 protected:
 
 	address();
@@ -65,8 +63,6 @@ public:
 
 	virtual ref <component> clone() const = 0;
 
-protected:
-
 	/** Parse an address from an input buffer.
 	  *
 	  * @param buffer input buffer
diff --git a/vmime/base.hpp b/vmime/base.hpp
index b7940311..957793d3 100644
--- a/vmime/base.hpp
+++ b/vmime/base.hpp
@@ -251,7 +251,7 @@ namespace vmime
 	template <class X, class Y>
 	ref <X> dynamicCast(ref <Y> y)
 	{
-		return y.dynamicCast <X>();
+		return y.template dynamicCast <X>();
 	}
 
 	/** Inherit from this class to indicate the subclass is not copyable,