diff --git a/src/mediaType.cpp b/src/mediaType.cpp
index 62d65c23..123c8cee 100644
--- a/src/mediaType.cpp
+++ b/src/mediaType.cpp
@@ -49,7 +49,7 @@ mediaType::mediaType(const string& type, const string& subType)
 
 
 void mediaType::parseImpl
-	(const parsingContext& ctx, const string& buffer, const string::size_type position,
+	(const parsingContext& /* ctx */, const string& buffer, const string::size_type position,
 	 const string::size_type end, string::size_type* newPosition)
 {
 	const string::value_type* const pend = buffer.data() + end;
diff --git a/src/net/smtp/SMTPCommandSet.cpp b/src/net/smtp/SMTPCommandSet.cpp
index 0454e184..a967c3a6 100644
--- a/src/net/smtp/SMTPCommandSet.cpp
+++ b/src/net/smtp/SMTPCommandSet.cpp
@@ -124,7 +124,7 @@ const string SMTPCommandSet::getText() const
 }
 
 
-const bool SMTPCommandSet::isFinished() const
+bool SMTPCommandSet::isFinished() const
 {
 	return (m_pipeline && m_started) || (m_commands.size() == 0 && m_started);
 }
diff --git a/vmime/net/smtp/SMTPCommandSet.hpp b/vmime/net/smtp/SMTPCommandSet.hpp
index 5b52ba0a..f97c4b2a 100644
--- a/vmime/net/smtp/SMTPCommandSet.hpp
+++ b/vmime/net/smtp/SMTPCommandSet.hpp
@@ -70,7 +70,7 @@ public:
 	  * @return true if all commands have been sent,
 	  * or false otherwise
 	  */
-	const bool isFinished() const;
+	bool isFinished() const;
 
 	/** Returns the last command which has been sent.
 	  *