diff --git a/archivebox/api/models.py b/archivebox/api/models.py
index 84aff120..aefbc47c 100644
--- a/archivebox/api/models.py
+++ b/archivebox/api/models.py
@@ -8,6 +8,7 @@ from django.conf import settings
 from django.db import models
 from django.utils import timezone
 
+from django_stubs_ext.db.models import TypedModelMeta
 
 
 def generate_secret_token() -> str:
@@ -24,7 +25,7 @@ class APIToken(models.Model):
     created = models.DateTimeField(auto_now_add=True)
     expires = models.DateTimeField(null=True, blank=True)
 
-    class Meta:
+    class Meta(TypedModelMeta):
         verbose_name = "API Key"
         verbose_name_plural = "API Keys"
 
diff --git a/archivebox/api/v1_api.py b/archivebox/api/v1_api.py
index 6b2c8c63..4fa5d94b 100644
--- a/archivebox/api/v1_api.py
+++ b/archivebox/api/v1_api.py
@@ -16,6 +16,8 @@ from api.auth import API_AUTH_METHODS
 from ..config import VERSION, COMMIT_HASH
 
 
+COMMIT_HASH = COMMIT_HASH or 'unknown'
+
 html_description=f'''
 <h3>Welcome to your ArchiveBox server's REST API <code>[v1 ALPHA]</code> homepage!</h3>
 <br/>