diff --git a/src/objects/admin.py b/src/objects/admin.py
index f55b75cea2..849691fcf2 100644
--- a/src/objects/admin.py
+++ b/src/objects/admin.py
@@ -64,6 +64,7 @@ class ObjectDBAdmin(admin.ModelAdmin):
     list_display_links = ('id', 'db_key')
     ordering = ['db_player', 'db_typeclass_path', 'id']
     search_fields = ['^db_key', 'db_typeclass_path']
+    raw_id_fields = ('db_destination', 'db_location', 'db_home')
 
     save_as = True
     save_on_top = True
diff --git a/src/players/admin.py b/src/players/admin.py
index eeed13e340..55b2f47b9a 100644
--- a/src/players/admin.py
+++ b/src/players/admin.py
@@ -135,7 +135,6 @@ class PlayerDBAdmin(BaseUserAdmin):
     inlines = [PlayerInline]
     add_form_template = "admin/players/add_form.html"
     change_form_template = "admin/players/change_form.html"
-    change_list_template = "admin/players/change_list.html"
     fieldsets = (
         (None, {'fields': ('username', 'password', 'email')}),
         ('Website profile', {'fields': ('first_name', 'last_name'),
@@ -167,4 +166,4 @@ class PlayerDBAdmin(BaseUserAdmin):
                                  typeclass=typeclass,
                                  player_dbobj=playerobj)
 
-admin.site.register(PlayerDB, PlayerDBAdmin)
\ No newline at end of file
+admin.site.register(PlayerDB, PlayerDBAdmin)