diff --git a/modules/angular2/test/render/dom/shadow_dom/emulated_unscoped_shadow_dom_strategy_spec.ts b/modules/angular2/test/render/dom/shadow_dom/emulated_unscoped_shadow_dom_strategy_spec.ts
index 253fca4a30..6d501e96c7 100644
--- a/modules/angular2/test/render/dom/shadow_dom/emulated_unscoped_shadow_dom_strategy_spec.ts
+++ b/modules/angular2/test/render/dom/shadow_dom/emulated_unscoped_shadow_dom_strategy_spec.ts
@@ -13,7 +13,7 @@ import {
 } from 'angular2/test_lib';
 
 import {DOM} from 'angular2/src/dom/dom_adapter';
-import {Map, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
+import {Map, ListWrapper} from 'angular2/src/facade/collection';
 
 import {
   EmulatedUnscopedShadowDomStrategy,
@@ -102,11 +102,11 @@ class FakeXHR extends XHR {
 
   constructor() {
     super();
-    this._responses = MapWrapper.create();
+    this._responses = <Map<string, string>>{};
   }
 
   get(url: string): Promise<string> {
-    var response = MapWrapper.get(this._responses, url);
+    var response = this._responses[url];
     if (isBlank(response)) {
       return PromiseWrapper.reject('xhr error', null);
     }
@@ -114,5 +114,5 @@ class FakeXHR extends XHR {
     return PromiseWrapper.resolve(response);
   }
 
-  reply(url: string, response: string) { MapWrapper.set(this._responses, url, response); }
+  reply(url: string, response: string) { this._responses[url] = response; }
 }
diff --git a/modules/angular2/test/render/dom/shadow_dom/native_shadow_dom_strategy_spec.ts b/modules/angular2/test/render/dom/shadow_dom/native_shadow_dom_strategy_spec.ts
index 4b762185a3..758f9e53a5 100644
--- a/modules/angular2/test/render/dom/shadow_dom/native_shadow_dom_strategy_spec.ts
+++ b/modules/angular2/test/render/dom/shadow_dom/native_shadow_dom_strategy_spec.ts
@@ -23,7 +23,7 @@ import {XHR} from 'angular2/src/render/xhr';
 
 import {isBlank} from 'angular2/src/facade/lang';
 import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
-import {Map, MapWrapper} from 'angular2/src/facade/collection';
+import {Map} from 'angular2/src/facade/collection';
 
 import {DOM} from 'angular2/src/dom/dom_adapter';
 
@@ -76,11 +76,11 @@ class FakeXHR extends XHR {
 
   constructor() {
     super();
-    this._responses = MapWrapper.create();
+    this._responses = <Map<string, string>>{};
   }
 
   get(url: string): Promise<string> {
-    var response = MapWrapper.get(this._responses, url);
+    var response = this._responses[url];
     if (isBlank(response)) {
       return PromiseWrapper.reject('xhr error', null);
     }
@@ -88,5 +88,5 @@ class FakeXHR extends XHR {
     return PromiseWrapper.resolve(response);
   }
 
-  reply(url: string, response: string) { MapWrapper.set(this._responses, url, response); }
+  reply(url: string, response: string) { this._responses[url] = response; }
 }
diff --git a/modules/angular2/test/render/dom/shadow_dom_emulation_integration_spec.ts b/modules/angular2/test/render/dom/shadow_dom_emulation_integration_spec.ts
index ef4dcd81d3..b541cd9304 100644
--- a/modules/angular2/test/render/dom/shadow_dom_emulation_integration_spec.ts
+++ b/modules/angular2/test/render/dom/shadow_dom_emulation_integration_spec.ts
@@ -43,9 +43,11 @@ export function main() {
               .toFactory((styleInliner, styleUrlResolver) => new EmulatedScopedShadowDomStrategy(
                              styleInliner, styleUrlResolver, styleHost),
                          [StyleInliner, StyleUrlResolver]),
-      "unscoped": bind(ShadowDomStrategy).toFactory(
-          (styleInliner, styleUrlResolver) => new EmulatedUnscopedShadowDomStrategy(
-              styleInliner, styleUrlResolver, null), [StyleInliner, StyleUrlResolver])
+      "unscoped":
+          bind(ShadowDomStrategy)
+              .toFactory((styleInliner, styleUrlResolver) => new EmulatedUnscopedShadowDomStrategy(
+                             styleInliner, styleUrlResolver, null),
+                         [StyleInliner, StyleUrlResolver])
     };
     if (DOM.supportsNativeShadowDOM()) {
       StringMapWrapper.set(
diff --git a/modules/examples/src/material/demo_common.ts b/modules/examples/src/material/demo_common.ts
index 03e1220e77..9c105d1aa4 100644
--- a/modules/examples/src/material/demo_common.ts
+++ b/modules/examples/src/material/demo_common.ts
@@ -44,7 +44,7 @@ export class DemoUrlResolver extends UrlResolver {
     }
 
     if (url[0] == '/') {
-      throw new BaseException(`Could not resolve the url ${url} from ${baseUrl}`);
+      return url;
     }
 
     var m = RegExpWrapper.firstMatch(_schemeRe, url);