diff --git a/js/bootstrap-formhelpers-colorpicker.js b/js/bootstrap-formhelpers-colorpicker.js
index 030e6d7..b730291 100644
--- a/js/bootstrap-formhelpers-colorpicker.js
+++ b/js/bootstrap-formhelpers-colorpicker.js
@@ -343,4 +343,4 @@
   $(document)
     .on('click.bfhcolorpicker.data-api', clearMenus);
 
-}(window.jQuery);
\ No newline at end of file
+}(jQuery);
diff --git a/js/bootstrap-formhelpers-countries.js b/js/bootstrap-formhelpers-countries.js
index f43df22..b5eb65e 100644
--- a/js/bootstrap-formhelpers-countries.js
+++ b/js/bootstrap-formhelpers-countries.js
@@ -203,4 +203,4 @@
     });
   });
 
-}(window.jQuery);
+}(jQuery);
diff --git a/js/bootstrap-formhelpers-currencies.js b/js/bootstrap-formhelpers-currencies.js
index 2475205..0cdfae7 100644
--- a/js/bootstrap-formhelpers-currencies.js
+++ b/js/bootstrap-formhelpers-currencies.js
@@ -213,4 +213,4 @@
   });
 
 
-}(window.jQuery);
+}(jQuery);
diff --git a/js/bootstrap-formhelpers-datepicker.js b/js/bootstrap-formhelpers-datepicker.js
index a5f6403..6dc80b1 100644
--- a/js/bootstrap-formhelpers-datepicker.js
+++ b/js/bootstrap-formhelpers-datepicker.js
@@ -581,4 +581,4 @@
   $(document)
     .on('click.bfhdatepicker.data-api', clearMenus);
 
-}(window.jQuery);
+}(jQuery);
diff --git a/js/bootstrap-formhelpers-fonts.js b/js/bootstrap-formhelpers-fonts.js
index d5b98e1..d948af2 100644
--- a/js/bootstrap-formhelpers-fonts.js
+++ b/js/bootstrap-formhelpers-fonts.js
@@ -179,4 +179,4 @@
     });
   });
 
-}(window.jQuery);
+}(jQuery);
diff --git a/js/bootstrap-formhelpers-fontsizes.js b/js/bootstrap-formhelpers-fontsizes.js
index 317fc30..f810342 100644
--- a/js/bootstrap-formhelpers-fontsizes.js
+++ b/js/bootstrap-formhelpers-fontsizes.js
@@ -179,4 +179,4 @@
     });
   });
 
-}(window.jQuery);
+}(jQuery);
diff --git a/js/bootstrap-formhelpers-googlefonts.js b/js/bootstrap-formhelpers-googlefonts.js
index d227403..0e1efc6 100644
--- a/js/bootstrap-formhelpers-googlefonts.js
+++ b/js/bootstrap-formhelpers-googlefonts.js
@@ -201,4 +201,4 @@
     });
   });
 
-}(window.jQuery);
+}(jQuery);
diff --git a/js/bootstrap-formhelpers-languages.js b/js/bootstrap-formhelpers-languages.js
index 98a6708..b10e183 100644
--- a/js/bootstrap-formhelpers-languages.js
+++ b/js/bootstrap-formhelpers-languages.js
@@ -227,4 +227,4 @@
     return this.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
   };
 
-}(window.jQuery);
+}(jQuery);
diff --git a/js/bootstrap-formhelpers-number.js b/js/bootstrap-formhelpers-number.js
index 1aa5c6a..69e63f3 100644
--- a/js/bootstrap-formhelpers-number.js
+++ b/js/bootstrap-formhelpers-number.js
@@ -192,7 +192,7 @@
         value = this.options.min;
       }
       
-      return parseInt(value);
+      return parseInt(value, 10);
     },
     
     formatNumber: function() {
@@ -297,4 +297,4 @@
    * =================================== */
 
 
-}(window.jQuery);
+}(jQuery);
diff --git a/js/bootstrap-formhelpers-phone.js b/js/bootstrap-formhelpers-phone.js
index 7a860c9..18db978 100644
--- a/js/bootstrap-formhelpers-phone.js
+++ b/js/bootstrap-formhelpers-phone.js
@@ -265,4 +265,4 @@
     });
   });
 
-}(window.jQuery);
+}(jQuery);
diff --git a/js/bootstrap-formhelpers-selectbox.js b/js/bootstrap-formhelpers-selectbox.js
index 61bca8e..a978318 100644
--- a/js/bootstrap-formhelpers-selectbox.js
+++ b/js/bootstrap-formhelpers-selectbox.js
@@ -344,4 +344,4 @@
   $(document)
     .on('click.bfhselectbox.data-api', clearMenus);
 
-}(window.jQuery);
+}(jQuery);
diff --git a/js/bootstrap-formhelpers-slider.js b/js/bootstrap-formhelpers-slider.js
index ac6ff8a..55eaeb8 100644
--- a/js/bootstrap-formhelpers-slider.js
+++ b/js/bootstrap-formhelpers-slider.js
@@ -217,4 +217,4 @@
     });
   });
 
-}(window.jQuery);
+}(jQuery);
diff --git a/js/bootstrap-formhelpers-states.js b/js/bootstrap-formhelpers-states.js
index a8403c8..1a46431 100644
--- a/js/bootstrap-formhelpers-states.js
+++ b/js/bootstrap-formhelpers-states.js
@@ -242,4 +242,4 @@
     });
   });
 
-}(window.jQuery);
+}(jQuery);
diff --git a/js/bootstrap-formhelpers-timepicker.js b/js/bootstrap-formhelpers-timepicker.js
index 6cfe097..afd3015 100644
--- a/js/bootstrap-formhelpers-timepicker.js
+++ b/js/bootstrap-formhelpers-timepicker.js
@@ -360,9 +360,11 @@
       var $timepicker;
       if ($(el).hasClass('bfh-timepicker')) {
         $timepicker = $(el).data('bfhtimepicker');
-        $timepicker.options.time = val;
-        $timepicker.setTime();
-        $timepicker.updatePopover();
+        if ($timepicker) {
+          $timepicker.options.time = val;
+          $timepicker.setTime();
+          $timepicker.updatePopover();
+        }
       } else if (origHook) {
         return origHook.set(el,val);
       }
@@ -390,4 +392,4 @@
   $(document)
     .on('click.bfhtimepicker.data-api', clearMenus);
 
-}(window.jQuery);
+}(jQuery);
diff --git a/js/bootstrap-formhelpers-timezones.js b/js/bootstrap-formhelpers-timezones.js
index ae0dc1c..ea024f4 100644
--- a/js/bootstrap-formhelpers-timezones.js
+++ b/js/bootstrap-formhelpers-timezones.js
@@ -211,4 +211,4 @@
     });
   });
 
-}(window.jQuery);
+}(jQuery);