diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j
index 4072adbb8..4bdd9ba1b 100644
--- a/AppKit/CPAlert.j
+++ b/AppKit/CPAlert.j
@@ -23,17 +23,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
-import <Foundation/CPString.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
 
-import <AppKit/CPApplication.j>
-import <AppKit/CPButton.j>
-import <AppKit/CPColor.j>
-import <AppKit/CPFont.j>
-import <AppKit/CPImage.j>
-import <AppKit/CPImageView.j>
-import <AppKit/CPPanel.j>
-import <AppKit/CPTextField.j>
+@import <AppKit/CPApplication.j>
+@import <AppKit/CPButton.j>
+@import <AppKit/CPColor.j>
+@import <AppKit/CPFont.j>
+@import <AppKit/CPImage.j>
+@import <AppKit/CPImageView.j>
+@import <AppKit/CPPanel.j>
+@import <AppKit/CPTextField.j>
 
 /*
     @global
@@ -240,4 +240,4 @@ var CPAlertWarningImage,
     [_alertPanel close];
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/Tools/Utilities/bridge.js b/Tools/Utilities/bridge.js
index e67aba8cf..6b27ce5a4 100644
--- a/Tools/Utilities/bridge.js
+++ b/Tools/Utilities/bridge.js
@@ -54,16 +54,20 @@ window.prompt  = function(obj)
 // This implementation is single-threaded (like browsers) but requires a call to serviceTimeouts()
 // Also includes beginning of a multithreaded implementation (commented out)
 
-window.setTimeout = function(callback, delay)
+window.setNativeTimeout = function(callback, delay)
 {
     return _scheduleTimeout(callback, delay, false);
 }
 
-window.setInterval = function(callback, delay)
+window.setTimeout = window.setNativeTimeout;
+
+window.setNativeInterval = function(callback, delay)
 {
     return _scheduleTimeout(callback, delay, true);
 }
 
+window.setInterval = window.setInterval;
+
 window.clearTimeout = function(id)
 {
     if (_timeouts[id])
@@ -548,7 +552,7 @@ XMLHttpRequest.prototype.send = function(body)
     if (this.onreadystatechange)
     {
          if (this.async)
-             setTimeout(this.onreadystatechange, 0);
+             setNativeTimeout(this.onreadystatechange, 0);
          else
              this.onreadystatechange();
     }