diff --git a/src/contents.js b/src/contents.js
index 81c7894..0f888ea 100644
--- a/src/contents.js
+++ b/src/contents.js
@@ -253,10 +253,24 @@ class Contents {
 			if (settings.scale) {
 				newContent.push("initial-scale=" + settings.scale);
 			}
-			if (settings.scalable) {
-				newContent.push("minimum-scale=" + settings.minimum);
-				newContent.push("maximum-scale=" + settings.maximum);
+
+			if (settings.scalable === "no") {
+				newContent.push("minimum-scale=" + settings.scale);
+				newContent.push("maximum-scale=" + settings.scale);
 				newContent.push("user-scalable=" + settings.scalable);
+			} else {
+
+				if (settings.scalable) {
+					newContent.push("user-scalable=" + settings.scalable);
+				}
+
+				if (settings.minimum) {
+					newContent.push("minimum-scale=" + settings.minimum);
+				}
+
+				if (settings.maximum) {
+					newContent.push("minimum-scale=" + settings.maximum);
+				}
 			}
 
 			if (!$viewport) {
diff --git a/src/managers/default/index.js b/src/managers/default/index.js
index a9447c7..bec4d62 100644
--- a/src/managers/default/index.js
+++ b/src/managers/default/index.js
@@ -1,5 +1,5 @@
 import EventEmitter from "event-emitter";
-import {extend, defer, windowBounds} from "../../utils/core";
+import {extend, defer, windowBounds, isNumber} from "../../utils/core";
 import Mapping from "../../mapping";
 import Queue from "../../utils/queue";
 import Stage from "../helpers/stage";
@@ -225,7 +225,7 @@ class DefaultViewManager {
 		var displayed = displaying.promise;
 
 		// Check if moving to target is needed
-		if (target === section.href || parseInt(target)) {
+		if (target === section.href || isNumber(target)) {
 			target = undefined;
 		}