diff --git a/docs/en/appium-setup/running-on-windows.md b/docs/en/appium-setup/running-on-windows.md
index f974e0c8c..451c570ed 100644
--- a/docs/en/appium-setup/running-on-windows.md
+++ b/docs/en/appium-setup/running-on-windows.md
@@ -56,7 +56,7 @@ arguments.
 
 ### Notes
 
-* You must supply the `--no-reset` and `--full-reset` flags for
+* You must supply the `--no-reset` or `--full-reset` flags for
   Android to work on Windows.
 * There exists a hardware accelerated emulator for Android, it has it's own
   limitations. For more information you can check out this
diff --git a/lib/devices/ios/ios-controller.js b/lib/devices/ios/ios-controller.js
index c42d81955..92dbfed54 100644
--- a/lib/devices/ios/ios-controller.js
+++ b/lib/devices/ios/ios-controller.js
@@ -1403,7 +1403,7 @@ iOSController.active = function (cb) {
 };
 
 iOSController.isWebContext = function () {
-  return !!this.curContext;
+  return this.curContext !== null && this.curContext !== NATIVE_WIN;
 };
 
 iOSController.webContextIndex = function () {
@@ -1445,6 +1445,7 @@ iOSController.getContexts = function (cb) {
 };
 
 iOSController.setContext = function (name, cb, skipReadyCheck) {
+  logger.debug("Attempting to set context to '" + name + "'");
   if (name === this.curContext) {
     cb(null, {
       status: status.codes.Success.code