Index: Rakefile
===================================================================
--- Rakefile	(revision 144)
+++ Rakefile	(working copy)
@@ -337,7 +337,7 @@
 task :compile_console => [:compile_libraries] do
   IronRuby.source_context do
     compile :console, :references => ['Microsoft.Scripting.Core.dll', 'Microsoft.Scripting.dll', 'IronRuby.dll'], :output => IRONRUBY_COMPILER
-    transform_config_file IronRuby.is_merlin? ? 'Merlin' : 'Svn', get_source_dir(:lang_root) + 'app.config', "#{build_path}\\ir.exe.config"
+    transform_config_file IronRuby.is_merlin? ? 'Merlin' : 'Svn', get_source_dir(:lang_root) + 'app.config', "#{build_path + 'ir.exe.config'}"
   end
 end
 
Index: context.rb
===================================================================
--- context.rb	(revision 144)
+++ context.rb	(working copy)
@@ -191,7 +191,7 @@
         [Pathname.new(libdir) + 'mono' + '2.0']
       }
       switches :all, 'noconfig'
-      remove_switches ['warnaserror+']
+      switches :debug, 'debug'
     }
   end
 end
@@ -495,9 +495,11 @@
           args[:resources].each_value { |res| cs_args << "resource:\"#{build_path + res}\"" }
         end
 
+        cs_args << "recurse:*.cs"
+
         switches = ''
         cs_args.each { |opt| switches << ' /' + opt }
-        cmd = CS_COMPILER + switches + ' ' + get_compile_path_list.join(" ")
+        cmd = CS_COMPILER + switches
         exec cmd
       end
     end
Index: src/microsoft.scripting/hosting/shell/BasicConsole.cs
===================================================================
--- src/microsoft.scripting/hosting/shell/BasicConsole.cs	(revision 144)
+++ src/microsoft.scripting/hosting/shell/BasicConsole.cs	(working copy)
@@ -105,16 +105,8 @@
         }
 
         protected void WriteColor(TextWriter output, string str, ConsoleColor c) {
-#if !SILVERLIGHT // Console.ForegroundColor
-            ConsoleColor origColor = Console.ForegroundColor;
-            Console.ForegroundColor = c;
-#endif
             output.Write(str);
             output.Flush();
-
-#if !SILVERLIGHT // Console.ForegroundColor
-            Console.ForegroundColor = origColor;
-#endif
         }
 
         #region IConsole Members
Index: src/ironruby/Runtime/RubyExecutionContext.cs
===================================================================
--- src/ironruby/Runtime/RubyExecutionContext.cs	(revision 144)
+++ src/ironruby/Runtime/RubyExecutionContext.cs	(working copy)
@@ -1396,7 +1396,7 @@
 
                     RubyModule module = scope.Method.DeclaringModule;
 
-                    _traceListener.Call(new[] {
+                    _traceListener.Call(new object[] {
                         MutableString.Create("call"),              // event
                         fileName,                                  // file
                         RuntimeHelpers.Int32ToObject(lineNumber),  // line
Index: src/microsoft.scripting.core/ast/Expression.cs
===================================================================
--- src/microsoft.scripting.core/ast/Expression.cs	(revision 144)
+++ src/microsoft.scripting.core/ast/Expression.cs	(working copy)
@@ -21,19 +21,19 @@
 using System.Diagnostics;
 
 namespace System.Linq.Expressions {
+    // TODO: expose this to derived classes, so ctor doesn't take three booleans?
+    [Flags]
+    public enum NodeFlags : byte {
+        None = 0,
+        Reducible = 1,
+        CanRead = 2,
+        CanWrite = 4,
+    }
+
     /// <summary>
     /// Expression is the base type for all nodes in Expression Trees
     /// </summary>
     public abstract partial class Expression {
-        // TODO: expose this to derived classes, so ctor doesn't take three booleans?
-        [Flags]
-        private enum NodeFlags : byte {
-            None = 0,
-            Reducible = 1,
-            CanRead = 2,
-            CanWrite = 4,
-        }
-
         // TODO: these two enums could be stored in one int32
         private readonly ExpressionType _nodeType;
         private readonly NodeFlags _flags;
Index: utils/IronRuby.Tests/runtime/HostingTests.cs
===================================================================
--- utils/IronRuby.Tests/runtime/HostingTests.cs	(revision 144)
+++ utils/IronRuby.Tests/runtime/HostingTests.cs	(working copy)
@@ -18,6 +18,7 @@
 using Microsoft.Scripting.Hosting;
 using System.Collections;
 using System.Collections.Generic;
+using IronRuby;
 using IronRuby.Builtins;
 
 namespace IronRuby.Tests {
@@ -65,7 +66,7 @@
             // the library paths are incorrect (not combined with location of .exe file) in partial trust:
             if (_driver.PartialTrust) return;
 
-            bool result = Engine.RequireFile("fcntl");
+            bool result = Ruby.RequireFile(Engine, "fcntl");
             Assert(result == true);
 
             var module = Runtime.Globals.GetVariable("Fcntl");