diff --git a/src/snek/system/template.py b/src/snek/system/template.py
index 22d007d..0e71b80 100644
--- a/src/snek/system/template.py
+++ b/src/snek/system/template.py
@@ -73,7 +73,7 @@ def set_link_target_blank(text):
         element.attrs['target'] = '_blank'
         element.attrs['rel'] = 'noopener noreferrer'
         element.attrs['referrerpolicy'] = 'no-referrer'
-        element.attrs['href'] = element.attrs['href'].strip(".")
+        element.attrs['href'] = element.attrs['href'].strip(".").strip(",")
 
     return str(soup)
 
diff --git a/src/snek/view/upload.py b/src/snek/view/upload.py
index a80ec72..f9bad33 100644
--- a/src/snek/view/upload.py
+++ b/src/snek/view/upload.py
@@ -77,7 +77,7 @@ class UploadView(BaseView):
             await self.services.drive_item.save(drive_item)
             response = "Uploaded [" + filename + "](/drive.bin/" + drive_item["uid"] + ")"
             #response = "<iframe width=\"100%\" frameborder=\"0\" allowfullscreen title=\"Embedded\" src=\"" + self.base_url + "/drive.bin/" + drive_item["uid"] + "\"></iframe>\n"
-            response = "[url](/drive.bin/" + drive_item["uid"] + extension + ")"
+            response = "[" + filename + "](/drive.bin/" + drive_item["uid"] + extension + ")"
 
             await self.services.chat.send(
                 self.request.session.get("uid"), channel_uid, response