diff --git a/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java b/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java
index 9288d5ace05..6571aa28df1 100644
--- a/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java
+++ b/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java
@@ -21,7 +21,7 @@ public class SkyDemoActivity extends SkyActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        String url = "https://domokit.github.io/home";
+        String url = "https://domokit.github.io/sky_home";
         Intent intent = getIntent();
         if (Intent.ACTION_VIEW.equals(intent.getAction())) {
             Uri skyUri = intent.getData();
diff --git a/examples/input/input_app.dart b/examples/input/input_app.dart
index 68256cfc354..9ef51dc2a5c 100644
--- a/examples/input/input_app.dart
+++ b/examples/input/input_app.dart
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import '../../framework/fn.dart';
-import '../../framework/components/input.dart';
+import 'package:sky/framework/fn.dart';
+import 'package:sky/framework/components/input.dart';
 
 class InputApp extends App {
   Node build() {
diff --git a/examples/widgets-fn/widgets_app.dart b/examples/widgets-fn/widgets_app.dart
index 2c1e8ca304c..6c30434ebbd 100644
--- a/examples/widgets-fn/widgets_app.dart
+++ b/examples/widgets-fn/widgets_app.dart
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import '../../framework/fn.dart';
-import '../../framework/components/button.dart';
-import '../../framework/components/popup_menu.dart';
+import 'package:sky/framework/fn.dart';
+import 'package:sky/framework/components/button.dart';
+import 'package:sky/framework/components/popup_menu.dart';
 
 class WidgetsApp extends App {
   static final Style _menuStyle = new Style('''
diff --git a/tools/deploy_sdk.py b/tools/deploy_sdk.py
index c74ab0da43c..ffb38ac1417 100755
--- a/tools/deploy_sdk.py
+++ b/tools/deploy_sdk.py
@@ -85,6 +85,11 @@ def link(from_root, to_root, filter_func=None):
     os.symlink(from_root, to_root)
 
 
+def make_relative_symlink(source, link_name):
+    rel_source = os.path.relpath(source, os.path.dirname(link_name))
+    os.symlink(rel_source, link_name)
+
+
 def confirm(prompt):
     response = raw_input('%s [N]|y: ' % prompt)
     return response and response.lower() == 'y'
@@ -117,6 +122,7 @@ def main():
         default=os.path.join(SRC_ROOT, DEFAULT_REL_BUILD_DIR))
     parser.add_argument('--non-interactive', action='store_true')
     parser.add_argument('--dev-environment', action='store_true')
+    parser.add_argument('--commit', action='store_true')
     parser.add_argument('--fake-pub-get-into', action='store', type=str)
     args = parser.parse_args()
 
@@ -129,7 +135,7 @@ def main():
     # These are separate ideas but don't need a separate flag yet.
     use_links = args.dev_environment
     skip_apks = args.dev_environment
-    should_commit = not args.dev_environment
+    should_commit = args.commit
     generate_licenses = not args.dev_environment
 
     # We save a bunch of time in --dev-environment mode by symlinking whole
@@ -201,9 +207,9 @@ def main():
     if args.fake_pub_get_into:
         packages_dir = os.path.abspath(args.fake_pub_get_into)
         ensure_dir_exists(packages_dir)
-        os.symlink(sdk_path('packages/mojo/lib'),
+        make_relative_symlink(sdk_path('packages/mojo/lib'),
             os.path.join(packages_dir, 'mojo'))
-        os.symlink(sdk_path('packages/sky/lib'),
+        make_relative_symlink(sdk_path('packages/sky/lib'),
             os.path.join(packages_dir, 'sky'))
 
     if should_commit: