diff --git a/VERSION b/VERSION
index 5a7f15dd..70a3046b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.0.3 (2012-08-31 13:37:26) stable
+Version 2.0.3 (2012-08-31 14:27:45) stable
diff --git a/gluon/dal.py b/gluon/dal.py
index 7ff96910..9f4f3c68 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -583,8 +583,9 @@ class ConnectionPool(object):
 ###################################################################################
 
 class BaseAdapter(ConnectionPool):
-
     driver = None
+    driver_name = None
+    drivers = () # list of drivers from which to pick
     maxcharlength = MAXCHARLENGTH
     commit_on_alter_table = False
     support_distributed_transaction = False
@@ -2673,8 +2674,6 @@ class JDBCPostgreSQLAdapter(PostgreSQLAdapter):
 class OracleAdapter(BaseAdapter):
     drivers = ('cx_Oracle',)
 
-    driver = globals().get('cx_Oracle',None)
-
     commit_on_alter_table = False
     types = {
         'boolean': 'CHAR(1)',
@@ -5474,7 +5473,6 @@ class IMAPAdapter(NoSQLAdapter):
         }
 
     dbengine = 'imap'
-    driver = globals().get('imaplib',None)
 
     def __init__(self,
                  db,
diff --git a/web2py.py b/web2py.py
index fbd402e9..26425777 100755
--- a/web2py.py
+++ b/web2py.py
@@ -9,10 +9,10 @@ if '__file__' in globals():
 elif hasattr(sys, 'frozen'):
     path = os.path.dirname(os.path.abspath(sys.executable)) # for py2exe
 else: #should never happen
-     path = os.getcwd()
+    path = os.getcwd()
 os.chdir(path)
 
-sys.path = [path]+[p for p in sys.path if not p==path]
+sys.path = [path]+[p for p in sys.path if not p == path]
 
 # import gluon.import_all ##### This should be uncommented for py2exe.py
 import gluon.widget