diff --git a/public/html/rss.xml b/public/html/rss.xml
index efe083e1fc..5a5bff51a5 100755
--- a/public/html/rss.xml
+++ b/public/html/rss.xml
@@ -22,13 +22,13 @@ cgitb.enable()
 
 # import libs
 sys.path.append('..')
-sys.path.append('../lib/py')
+sys.path.append('../lib')
+sys.path.append('../app')
 
 import webnotes
 import webnotes.auth
 
 import conf
-sys.path.append(conf.modules_path)
 
 if __name__=='__main__':
 	# webnotes.http_request = webnotes.auth.HTTPRequest()
diff --git a/public/html/sitemap.xml b/public/html/sitemap.xml
index 09ce39a8b9..abc96ec399 100755
--- a/public/html/sitemap.xml
+++ b/public/html/sitemap.xml
@@ -21,7 +21,8 @@ cgitb.enable()
 
 # import libs
 sys.path.append('..')
-sys.path.append('../lib/py')
+sys.path.append('../lib')
+sys.path.append('../app')
 
 import webnotes
 import webnotes.auth
diff --git a/public/js/wn/form/formatters.js b/public/js/wn/form/formatters.js
index e5ff50eadf..8404dd84fd 100644
--- a/public/js/wn/form/formatters.js
+++ b/public/js/wn/form/formatters.js
@@ -48,6 +48,9 @@ wn.form.formatters = {
 		});
 		return html;
 	},
+	SmallText: function(value) {
+		return wn.form.formatters.Text(value);
+	},
 	WorkflowState: function(value) {
 		workflow_state = wn.meta.get("Workflow State", value)[0];
 		if(workflow_state) {
@@ -66,5 +69,5 @@ wn.form.formatters = {
 }
 
 wn.form.get_formatter = function(fieldtype) {
-	return wn.form.formatters[fieldtype] || wn.form.formatters.Data;
+	return wn.form.formatters[fieldtype.replace(/ /g, "")] || wn.form.formatters.Data;
 }
\ No newline at end of file
diff --git a/webnotes/__init__.py b/webnotes/__init__.py
index 68d1efc618..1c872fed15 100644
--- a/webnotes/__init__.py
+++ b/webnotes/__init__.py
@@ -306,7 +306,9 @@ def reload_doc(module, dt=None, dn=None):
 	import webnotes.modules
 	return webnotes.modules.reload_doc(module, dt, dn)
 
-from webnotes.model.rename_doc import rename_doc
+def rename_doc(doctype, old, new, is_doctype=0, debug=0):
+	from webnotes.model.rename_doc import rename_doc
+	rename_doc(doctype, old, new, is_doctype, debug)
 
 def insert(doclist):
 	import webnotes.model
diff --git a/wnf.py b/wnf.py
index 6e3dfe24f6..ded0f3866c 100755
--- a/wnf.py
+++ b/wnf.py
@@ -83,10 +83,6 @@ def rebuild():
 	# build js / css
 	from webnotes.utils import bundlejs
 	bundlejs.bundle(False)		
-
-	# build cache
-	import website.web_cache
-	website.web_cache.refresh_cache(['Blog'])
 	
 def apply_latest_patches():
 	import webnotes.modules.patch_handler
@@ -415,9 +411,6 @@ def run():
 		import webnotes.cms.make
 		webnotes.cms.make.make()
 		
-		import website.web_cache
-		website.web_cache.refresh_cache(['Blog'])
-		
 	elif options.clear_cache:
 		clear_cache()