diff --git a/src/wizard/examples/wizard.js b/src/wizard/examples/wizard.js
index e5d26343e..20317bc8d 100644
--- a/src/wizard/examples/wizard.js
+++ b/src/wizard/examples/wizard.js
@@ -53,7 +53,7 @@
   </file>
   <file name="wizard-container.html">
   <pf-wizard wizard-title="Wizard Title"
-    wizard-ready="deployProviderReady"
+    wizard-ready="wizardReady"
     on-finish="finishedWizard()"
     on-cancel="cancelDeploymentWizard()"
     next-title="nextButtonTitle"
@@ -199,9 +199,12 @@
           ipsum: ''
         };
         $scope.secondaryLoadInformation = 'ipsum dolor sit amet, porta at suspendisse ac, ut wisi vivamus, lorem sociosqu eget nunc amet.';
+
+        $scope.wizardReady = false;
         $timeout(function () {
-          $scope.deployReady = true;
+          $scope.wizardReady = true;
         }, 1000);
+
         $scope.nextButtonTitle = "Next >";
       };
 
diff --git a/src/wizard/wizard.component.js b/src/wizard/wizard.component.js
index 14aec0284..461e89dfc 100644
--- a/src/wizard/wizard.component.js
+++ b/src/wizard/wizard.component.js
@@ -3,27 +3,27 @@ angular.module('patternfly.wizard').component('pfWizard', {
   bindings: {
     title: '@',
     wizardTitle: '@',
-    hideIndicators: '=?',
+    hideIndicators: '<?',
     activeStepTitleOnly: '<?',
     hideSidebar: '@',
     hideHeader: '@',
     hideBackButton: '@',
     sidebarClass: '@',
     stepClass: '@',
-    contentHeight: '=?',
+    contentHeight: '<?',
     currentStep: '<?',
-    cancelTitle: '=?',
-    backTitle: '=?',
-    nextTitle: '=?',
-    backCallback: '=?',
-    nextCallback: '=?',
+    cancelTitle: '<?',
+    backTitle: '<?',
+    nextTitle: '<?',
+    backCallback: '<?',
+    nextCallback: '<?',
     onFinish: '&',
     onCancel: '&',
-    wizardReady: '=?',
-    wizardDone: '=?',
-    loadingWizardTitle: '=?',
-    loadingSecondaryInformation: '=?',
-    embedInPage: '=?',
+    wizardReady: '<?',
+    wizardDone: '<?',
+    loadingWizardTitle: '<?',
+    loadingSecondaryInformation: '<?',
+    embedInPage: '<?',
     onStepChanged: '&?'
   },
   templateUrl: 'wizard/wizard.html',
@@ -208,6 +208,7 @@ angular.module('patternfly.wizard').component('pfWizard', {
     ctrl.allowStepIndicatorClick = function (step) {
       return step.allowClickNav &&
         !ctrl.wizardDone &&
+        ctrl.selectedStep &&
         ctrl.selectedStep.okToNavAway &&
         (ctrl.selectedStep.nextEnabled || (step.stepPriority < ctrl.selectedStep.stepPriority)) &&
         (ctrl.selectedStep.prevEnabled || (step.stepPriority > ctrl.selectedStep.stepPriority));
@@ -215,6 +216,7 @@ angular.module('patternfly.wizard').component('pfWizard', {
 
     ctrl.stepClick = function (step) {
       if (step.allowClickNav &&
+        ctrl.selectedStep &&
         !ctrl.wizardDone &&
         ctrl.selectedStep.okToNavAway &&
         (ctrl.selectedStep.nextEnabled || (step.stepPriority < ctrl.selectedStep.stepPriority)) &&