diff --git a/files/helpers/actions.py b/files/helpers/actions.py
index b159b5449..f2b433472 100644
--- a/files/helpers/actions.py
+++ b/files/helpers/actions.py
@@ -3,8 +3,7 @@ from files.classes.badges import Badge
 from files.helpers.alerts import send_repeatable_notification
 
 def badge_grant(user, badge_id, description=None, url=None):
-	if not user:
-		raise ValueError('badge_grant: expected user, not None')
+	assert user != None
 	if user.has_badge(badge_id):
 		return
 
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 07a940775..26a2ce116 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -848,7 +848,7 @@
 	{% endif %}
 
 	{% if v %}
-		<script src="/assets/js/marked.js?v=258"></script>
+		<script src="{{asset('js/marked.js')}}"></script>
 		<script src="/assets/js/comments_v.js?v=277"></script>
 	{% endif %}
 
diff --git a/files/templates/default.html b/files/templates/default.html
index 17e25ce0a..f5846f281 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -354,7 +354,7 @@
 
 {% if v %}
 	<script src="/assets/js/post_toast2.js?v=243"></script>
-	<script src="/assets/js/formatting.js?v=240"></script>
+	<script src="{{asset('js/formatting.js')}}"></script>
 {% endif %}
 
 <script src="/assets/js/lite-youtube.js?v=241"></script>
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 26c24b84c..ff8037975 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -223,9 +223,9 @@
 			</script>
 		{% endif %}
 
-		<script src="/assets/js/marked.js?v=258"></script>
-		<script src="/assets/js/formatting.js?v=240"></script>
-		<script src="/assets/js/submit.js?v=261"></script>
+		<script src="{{asset('js/marked.js')}}"></script>
+		<script src="{{asset('js/formatting.js')}}"></script>
+		<script src="{{asset('js/submit.js')}}"></script>
 		{% include "emoji_modal.html" %}
 		{% include "gif_modal.html" %}
 
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index c2b4869f5..c1870e4ef 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -773,7 +773,7 @@
 </nav>
 {% endif %}
 
-<script src="/assets/js/marked.js?v=258"></script>
+<script src="{{asset('js/marked.js')}}"></script>
 
 
 {% if v and v.id != u.id and '/comments' not in request.path %}
diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html
index eea9ff619..810d87414 100644
--- a/files/templates/util/assetcache.html
+++ b/files/templates/util/assetcache.html
@@ -18,8 +18,11 @@ set CACHE_VER = {
 	'js/award_modal.js': 253,
 	'js/bootstrap.js': 259,
 	'js/comments+submission_listing.js': 261,
+	'js/formatting.js': 240,
 	'js/header.js': 272,
 	'js/lottery.js': 254,
+	'js/marked.js': 258,
+	'js/submit.js': 261,
 	'js/userpage.js': 241,
 	'js/userpage_v.js': 245,