diff --git a/VERSION b/VERSION
index 1d074d70..cfe0199f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.2.1 (2012-11-17 08:59:48) stable
+Version 2.2.1 (2012-11-17 11:46:41) stable
diff --git a/applications/admin/static/js/web2py.js b/applications/admin/static/js/web2py.js
index 61f45e30..34a50546 100644
--- a/applications/admin/static/js/web2py.js
+++ b/applications/admin/static/js/web2py.js
@@ -110,7 +110,8 @@ function web2py_ajax_page(method, action, data, target) {
 
 function web2py_component(action, target, timeout, times){
   jQuery(function(){
-    var element = jQuery("#" + target).get(0);
+    var jelement = jQuery("#" + target);
+    var element = jelement.get(0);
     var statement = "jQuery('#" + target + "').get(0).reload();";
     element.reload = function (){
         // Continue if times is Infinity or
@@ -119,6 +120,7 @@ function web2py_component(action, target, timeout, times){
             web2py_ajax_page('get', action, null, target);} }; // reload
     // Method to check timing limit
     element.reload_check = function (){
+        if (jelement.hasClass('w2p_component_stop')) {return false;}
         if (this.reload_counter == Infinity){return true;}
         else {
             if (!isNaN(this.reload_counter)){
diff --git a/applications/examples/static/js/web2py.js b/applications/examples/static/js/web2py.js
index 61f45e30..34a50546 100644
--- a/applications/examples/static/js/web2py.js
+++ b/applications/examples/static/js/web2py.js
@@ -110,7 +110,8 @@ function web2py_ajax_page(method, action, data, target) {
 
 function web2py_component(action, target, timeout, times){
   jQuery(function(){
-    var element = jQuery("#" + target).get(0);
+    var jelement = jQuery("#" + target);
+    var element = jelement.get(0);
     var statement = "jQuery('#" + target + "').get(0).reload();";
     element.reload = function (){
         // Continue if times is Infinity or
@@ -119,6 +120,7 @@ function web2py_component(action, target, timeout, times){
             web2py_ajax_page('get', action, null, target);} }; // reload
     // Method to check timing limit
     element.reload_check = function (){
+        if (jelement.hasClass('w2p_component_stop')) {return false;}
         if (this.reload_counter == Infinity){return true;}
         else {
             if (!isNaN(this.reload_counter)){
diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js
index 61f45e30..34a50546 100644
--- a/applications/welcome/static/js/web2py.js
+++ b/applications/welcome/static/js/web2py.js
@@ -110,7 +110,8 @@ function web2py_ajax_page(method, action, data, target) {
 
 function web2py_component(action, target, timeout, times){
   jQuery(function(){
-    var element = jQuery("#" + target).get(0);
+    var jelement = jQuery("#" + target);
+    var element = jelement.get(0);
     var statement = "jQuery('#" + target + "').get(0).reload();";
     element.reload = function (){
         // Continue if times is Infinity or
@@ -119,6 +120,7 @@ function web2py_component(action, target, timeout, times){
             web2py_ajax_page('get', action, null, target);} }; // reload
     // Method to check timing limit
     element.reload_check = function (){
+        if (jelement.hasClass('w2p_component_stop')) {return false;}
         if (this.reload_counter == Infinity){return true;}
         else {
             if (!isNaN(this.reload_counter)){
diff --git a/gluon/contrib/fpdf/html.py b/gluon/contrib/fpdf/html.py
index 85125301..f379fcd5 100644
--- a/gluon/contrib/fpdf/html.py
+++ b/gluon/contrib/fpdf/html.py
@@ -28,7 +28,7 @@ class HTML2FPDF(HTMLParser):
 
     def __init__(self, pdf, image_map = None):
         HTMLParser.__init__(self)
-        self.image_map = self.image_map or lambda src: src
+        self.image_map = image_map or (lambda src: src)
         self.style = {}
         self.pre = False
         self.href = ''
diff --git a/gluon/dal.py b/gluon/dal.py
index 66533eb2..993bf849 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -3970,7 +3970,7 @@ class DatabaseStoredFile:
         self.filename = filename
         self.mode = mode
         if not self.web2py_filesystem:
-            self.db.executesql("CREATE TABLE IF NOT EXISTS web2py_filesystem (path VARCHAR(512), content LONGTEXT, PRIMARY KEY(path) ) ENGINE=InnoDB;")
+            self.db.executesql("CREATE TABLE IF NOT EXISTS web2py_filesystem (path VARCHAR(255), content LONGTEXT, PRIMARY KEY(path) ) ENGINE=InnoDB;")
             DatabaseStoredFile.web2py_filesystem = True
         self.p=0
         self.data = ''