diff --git a/lib/galaxy/security/validate_user_input.py b/lib/galaxy/security/validate_user_input.py
index 0d3b68921ac..705519df9ff 100644
--- a/lib/galaxy/security/validate_user_input.py
+++ b/lib/galaxy/security/validate_user_input.py
@@ -23,8 +23,12 @@ def validate_publicname( trans, publicname, user=None ):
         return ''
     if user and user.username == publicname:
         return ''
-    if len( publicname ) < 4:
-        return "Public name must be at least 4 characters in length"
+    if trans.webapp.name == 'tool_shed':
+        if len( publicname ) < 3:
+            return "Public name must be at least 3 characters in length"
+    else:
+        if len( publicname ) < 4:
+            return "Public name must be at least 4 characters in length"   
     if len( publicname ) > 255:
         return "Public name cannot be more than 255 characters in length"
     if not( VALID_PUBLICNAME_RE.match( publicname ) ):
diff --git a/tools/data_source/upload.xml b/tools/data_source/upload.xml
index de02c4afd36..e15de2ffbd2 100644
--- a/tools/data_source/upload.xml
+++ b/tools/data_source/upload.xml
@@ -33,7 +33,7 @@
     </param>
     <param name="async_datasets" type="hidden" value="None"/>
     <upload_dataset name="files" title="Specify Files for Dataset" file_type_name="file_type" metadata_ref="files_metadata">
-        <param name="file_data" type="file" size="30" label="File" ajax-upload="true" help="TIP: Due to browser limitations, uploading files larger than 2GB is guaranteed to fail.  To upload large files, use the URL method (below) or FTP (if enabled by the site administrator).">
+        <param name="file_data" type="file" size="30" label="File" ajax-upload="false" help="TIP: Due to browser limitations, uploading files larger than 2GB is guaranteed to fail.  To upload large files, use the URL method (below) or FTP (if enabled by the site administrator).">
         <validator type="expression" message="You will need to reselect the file you specified (%s)." substitute_value_in_message="True">not ( ( isinstance( value, unicode ) or isinstance( value, str ) ) and value != "" )</validator> <!-- use validator to post message to user about needing to reselect the file, since most browsers won't accept the value attribute for file inputs -->
       </param>
       <param name="url_paste" type="text" area="true" size="5x35" label="URL/Text" help="Here you may specify a list of URLs (one per line) or paste the contents of a file."/>