diff --git a/bin/run b/bin/run
index cfdee23f..fb0347bc 100755
--- a/bin/run
+++ b/bin/run
@@ -1,3 +1,10 @@
 #!/usr/bin/env bash
-source .env
+
+# Ideally I would use stdin with source, but in older bash versions this
+# wasn't supported properly.
+TEMP_ENV_FILE=`mktemp /tmp/redash_env.XXXXXX`
+sed 's/^REDASH/export REDASH/' .env > $TEMP_ENV_FILE
+source $TEMP_ENV_FILE
+rm $TEMP_ENV_FILE
+
 exec "$@"
diff --git a/manage.py b/manage.py
index 8badda29..ee9ea923 100755
--- a/manage.py
+++ b/manage.py
@@ -130,6 +130,7 @@ def list():
 @data_sources_manager.command
 def new(name, type, options):
     """Create new data source"""
+    # TODO: validate it's a valid type and in the future, validate the options.
     print "Creating {} data source ({}) with options:\n{}".format(type, name, options)
     data_source = models.DataSource.create(name=name,
                                            type=type,