diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/facade/AndroidFacade.java b/src/main/java/org/qpython/qsl4a/qsl4a/facade/AndroidFacade.java
index d6db9e92f33e6e54ee294c853c390e1b8e43840a..62991ca7c7c8c51d52c52c767b96856c304f2e13 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/facade/AndroidFacade.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/facade/AndroidFacade.java
@@ -376,7 +376,7 @@ public class AndroidFacade extends RpcReceiver {
 
   void startActivity(final Intent intent) {
     try {
-      intent.setFlags(intentFlags);
+      intent.setFlags(intent.getFlags() | intentFlags);
       context.startActivity(intent);
     } catch (Exception e) {
       LogUtil.e("Failed to launch intent.", e);
@@ -426,7 +426,6 @@ public class AndroidFacade extends RpcReceiver {
   }
 
   public void doStartActivity(final Intent intent, Boolean wait) throws Exception {
-    intent.setFlags(intent.getFlags() | intentFlags);
     if (wait == null || !wait) {
       startActivity(intent);
     } else {
@@ -436,6 +435,7 @@ public class AndroidFacade extends RpcReceiver {
         @Override
         public void onCreate() {
           super.onCreate();
+          intent.setFlags(intent.getFlags() | intentFlags);
           startActivity(intent);
         }
 
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java b/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java
index 6d376e52a2923a24d0207732a666c51c2287e531..189015288107af56a78efc9f221b0f70f126f7ad 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java
@@ -16,6 +16,7 @@
 
 package org.qpython.qsl4a.qsl4a.facade;
 
+import android.annotation.SuppressLint;
 import android.app.Service;
 
 import android.content.Context;
@@ -62,7 +63,7 @@ import java.util.concurrent.CountDownLatch;
 public class CameraFacade extends RpcReceiver {
 
   private final Service mService;
-  private final Parameters mParameters;
+  private Parameters mParameters;
   private final Context context;
 
   private class BooleanResult {
@@ -77,12 +78,12 @@ public class CameraFacade extends RpcReceiver {
     context = mService.getApplicationContext();
     //  ↑  //
 
-    Camera camera = Camera.open();
+    /*Camera camera = Camera.open();
     try {
       mParameters = camera.getParameters();
     } finally {
       camera.release();
-    }
+    }*/
   }
 
   @Rpc(description = "Take a picture and save it to the specified path.", returns = "A map of Booleans autoFocus and takePicture where True indicates success.")
@@ -93,7 +94,12 @@ public class CameraFacade extends RpcReceiver {
     final BooleanResult takePictureResult = new BooleanResult();
 
     Camera camera = Camera.open();
-    camera.setParameters(mParameters);
+    /*try {
+      mParameters = camera.getParameters();
+    } finally {
+      camera.release();
+    }
+    camera.setParameters(mParameters);*/
 
     try {
       Method method = camera.getClass().getMethod("setDisplayOrientation", int.class);
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/facade/PhoneFacade.java b/src/main/java/org/qpython/qsl4a/qsl4a/facade/PhoneFacade.java
index 57e1a00d033c218d4dc622c1387c027305c32a52..f13bb9bc6c321d3df3190c604fa6c02cc78be90f 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/facade/PhoneFacade.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/facade/PhoneFacade.java
@@ -206,7 +206,7 @@ public class PhoneFacade extends RpcReceiver {
         // TODO(damonkohler): API level 5 has many more types.
         int networkType;
         if (SDK_INT >= 24) {
-        networkType = mTelephonyManager.getDataNetworkType();
+            networkType = mTelephonyManager.getDataNetworkType();
         } else {
             networkType = mTelephonyManager.getNetworkType();
         }