diff --git a/pyweb/templates/404.html b/pyweb/templates/404.html
index db52713..6cb4e61 100644
--- a/pyweb/templates/404.html
+++ b/pyweb/templates/404.html
@@ -1,4 +1,4 @@
-{% extends "index.htm" %}
+{% extends "index.html" %}
 {% block Content %}
 I'm not sure what you are looking for, but it isn't here. :(
 {% endblock %}
diff --git a/pyweb/templates/500.html b/pyweb/templates/500.html
index d0f7f42..d8c59a8 100644
--- a/pyweb/templates/500.html
+++ b/pyweb/templates/500.html
@@ -1,4 +1,4 @@
-{% extends "index.htm" %}
+{% extends "index.html" %}
 {% block Content %}
 Hm, that didn't work. You might want to check the server logs to see why.
 {% endblock %}
diff --git a/pyweb/urls.py b/pyweb/urls.py
index 651f383..65e64a7 100644
--- a/pyweb/urls.py
+++ b/pyweb/urls.py
@@ -22,6 +22,8 @@ admin.autodiscover()
 
 from django.conf import settings
 
+handler404 = 'django.views.defaults.page_not_found'
+handler500 = 'django.views.defaults.server_error'
 
 urlpatterns = patterns('',
 	(r'^/?$',               'mumble.views.redir' ),
@@ -46,7 +48,7 @@ if "rosetta" in settings.INSTALLED_APPS:
 	)
 
 # Development stuff
-if settings.DEBUG:
+if settings.DEBUG or True:
 	urlpatterns += patterns('',
 		(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:],
 		'django.views.static.serve',