diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 3f985a13d..fd84d7c94 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -904,7 +904,12 @@ object Defaults extends BuildCommon {
   lazy val projectBaseSettings: Seq[Setting[_]] = projectCore ++ runnerSettings ++ paths ++ baseClasspaths ++ baseTasks ++ compileBase ++ disableAggregation
 
   // These are project level settings that MUST be on every project.  
-  lazy val coreDefaultSettings: Seq[Setting[_]] = projectCore ++ disableAggregation
+  lazy val coreDefaultSettings: Seq[Setting[_]] =
+    projectCore ++ disableAggregation ++ Seq(
+      // Missing but core settings
+      baseDirectory := thisProject.value.base,
+      target := baseDirectory.value / "target"
+    )
   @deprecated("Default settings split into coreDefaultSettings and IvyModule/JvmModule plugins.", "0.13.2")
   lazy val defaultSettings: Seq[Setting[_]] = projectBaseSettings ++ defaultConfigs
 }
@@ -982,6 +987,7 @@ object Classpaths {
   val ivyPublishSettings: Seq[Setting[_]] = publishGlobalDefaults ++ Seq(
     artifacts :== Nil,
     packagedArtifacts :== Map.empty,
+    crossTarget := target.value,
     makePom := { val config = makePomConfiguration.value; IvyActions.makePom(ivyModule.value, config, streams.value.log); config.file },
     packagedArtifact in makePom := (artifact in makePom value, makePom value),
     deliver <<= deliverTask(deliverConfiguration),
diff --git a/sbt/src/sbt-test/project/default-auto-plugins/build.sbt b/sbt/src/sbt-test/project/default-auto-plugins/build.sbt
new file mode 100644
index 000000000..c56420961
--- /dev/null
+++ b/sbt/src/sbt-test/project/default-auto-plugins/build.sbt
@@ -0,0 +1,8 @@
+// TODO - currently root plugins (trigger == allRequirements && requires = Nil) can't be disabled, ever.
+//lazy val noCore = project.disablePlugins(plugins.CorePlugin)
+
+lazy val noIvy = project.disablePlugins(plugins.IvyPlugin)
+
+lazy val noJvm = project.disablePlugins(plugins.JvmPlugin)
+
+lazy val noJunit = project.disablePlugins(plugins.JUnitXmlReportPlugin)
diff --git a/sbt/src/sbt-test/project/default-auto-plugins/test b/sbt/src/sbt-test/project/default-auto-plugins/test
new file mode 100644
index 000000000..b74aeea0c
--- /dev/null
+++ b/sbt/src/sbt-test/project/default-auto-plugins/test
@@ -0,0 +1,5 @@
+> noJunit/test
+
+> noJvm/update
+
+# TODO - Tests for noIvy + noCore
\ No newline at end of file