diff --git a/ivy/IvyInterface.scala b/ivy/IvyInterface.scala
index ef4fc9569..55ac855bc 100644
--- a/ivy/IvyInterface.scala
+++ b/ivy/IvyInterface.scala
@@ -323,7 +323,7 @@ final case class Configuration(name: String, description: String, isPublic: Bool
 
 final case class Artifact(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Iterable[Configuration], url: Option[URL], extraAttributes: Map[String,String]) extends NotNull
 {
-	def extra(attributes: (String,String)*) = Artifact(name, `type`, extension, classifier, configurations, url, extraAttributes ++ attributes)
+	def extra(attributes: (String,String)*) = Artifact(name, `type`, extension, classifier, configurations, url, extraAttributes ++ ModuleID.checkE(attributes))
 }
 object Artifact
 {
diff --git a/ivy/IvyScala.scala b/ivy/IvyScala.scala
index 38ea1bd84..b7d089a60 100644
--- a/ivy/IvyScala.scala
+++ b/ivy/IvyScala.scala
@@ -47,7 +47,7 @@ private object IvyScala
 	private def configurationSet(configurations: Iterable[Configuration]) = HashSet(configurations.map(_.toString).toSeq : _*)
 	/** Adds exclusions for the scala library and compiler jars so that they are not downloaded.  This is
 	* done because normally these jars are already on the classpath and cannot/should not be overridden.  The version
-	* of Scala to use is done by setting scala.version in the project definition. */
+	* of Scala to use is done by setting build.scala.versions in the project definition. */
 	private def excludeScalaJars(module: DefaultModuleDescriptor, configurations: Iterable[Configuration])
 	{
 		val configurationNames =