diff --git a/py/core/doctype/search_criteria/search_criteria.py b/py/core/doctype/search_criteria/search_criteria.py
index 56f9ab2785..4c2788bcef 100644
--- a/py/core/doctype/search_criteria/search_criteria.py
+++ b/py/core/doctype/search_criteria/search_criteria.py
@@ -47,7 +47,9 @@ class DocType:
 			webnotes.conn.set(self.doc,'module',doctype_module and doctype_module[0][0] or 'NULL')
 
 	def validate(self):
-		if webnotes.conn.sql("select name from `tabSearch Criteria` where criteria_name=%s and name!=%s", (self.doc.criteria_name, self.doc.name)):
+		if webnotes.conn.sql("select name from `tabSearch Criteria` where \
+				criteria_name=%s and name!=%s", (self.doc.criteria_name,
+					self.doc.name)):
 			webnotes.msgprint("Criteria Name '%s' already used, please use another name" % self.doc.criteria_name, raise_exception = 1)
 
 	def on_update(self):
diff --git a/py/webnotes/boot.py b/py/webnotes/boot.py
index ea6b6049dc..6d6b62a251 100644
--- a/py/webnotes/boot.py
+++ b/py/webnotes/boot.py
@@ -43,6 +43,11 @@ def get_bootinfo():
 	for field in ['mail_login', 'mail_password', 'mail_port', 'outgoing_mail_server', 'use_ssl']:
 		del cp[field]
 	
+	import webnotes.defs
+	from webnotes.utils import cint
+	cp['sync_with_gateway'] = hasattr(webnotes.defs, 'sync_with_gateway') and \
+			cint(webnotes.defs.sync_with_gateway) or 0
+	
 	# system info
 	bootinfo['control_panel'] = cp.copy()
 	bootinfo['account_name'] = cp.get('account_id')
diff --git a/py/webnotes/defs_template.py b/py/webnotes/defs_template.py
index 550262376c..6deb7a1e41 100644
--- a/py/webnotes/defs_template.py
+++ b/py/webnotes/defs_template.py
@@ -139,6 +139,3 @@ backup_link_path = '/var/www/wnframework/backups'
 # url to be emailed to the "System Manager" Role to download
 # the backup
 backup_url = 'http://localhost/backups'
-
-# System TimeZone (should be acceptable by pytz: Recommended format Continent/City)
-system_timezone = 'Asia/Kolkata'