diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 34cc9eaec8..a329b1ef10 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -61,12 +61,12 @@
       hostname = "localhost"
       port = 9999
       connection-timeout = 1000 # in millis (1 sec default)
-    <server>
+    </server>
 
     <client>
       reconnect-delay = 5000    # in millis (5 sec default)
       read-timeout = 10000      # in millis (10 sec default)
-    <client>
+    </client>
   </remote>
  
   <storage>
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 5b2958ddf5..41a51b8c8c 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -5,8 +5,6 @@
 import sbt._
 import sbt.CompileOrder._
 
-import scala.Array
-
 import java.util.jar.Attributes
 import java.util.jar.Attributes.Name._
 import java.io.File
@@ -22,11 +20,12 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
   val SCALATEST_VERSION = "1.0.1-for-scala-2.8.0.Beta1-with-test-interfaces-0.3-SNAPSHOT"
 
   // ------------------------------------------------------------
-  val encodingUtf8 = List("-encoding", "UTF-8")
-
   lazy val deployPath = info.projectPath / "deploy"
   lazy val distPath = info.projectPath / "dist"
 
+  override def compileOptions = super.compileOptions ++ 
+    Seq("-deprecation", "-Xmigration", "-Xcheckinit", "-Xstrict-warnings", "-Xwarninit", "-encoding", "utf8").map(x => CompileOption(x))
+
   override def javaCompileOptions = JavaCompileOption("-Xlint:unchecked") :: super.javaCompileOptions.toList
 
   def distName = "%s_%s-%s.zip".format(name, buildScalaVersion, version)