diff --git a/planetstack/hpc/admin.py b/planetstack/hpc/admin.py
index ee9e42b..2a6d518 100644
--- a/planetstack/hpc/admin.py
+++ b/planetstack/hpc/admin.py
@@ -32,16 +32,22 @@
     model = CDNPrefix
     extra = 0
     suit_classes = 'suit-tab suit-tab-prefixes'
+    fields = ('cdn_prefix_id', 'prefix', 'defaultOriginServer', 'enabled')
+    readonly_fields = ('cdn_prefix_id',)
 
 class CDNPrefixROInline(ReadOnlyTabularInline):
     model = CDNPrefix
     extra = 0
     suit_classes = 'suit-tab suit-tab-prefixes'
+    fields = ('cdn_prefix_id', 'prefix', 'defaultOriginServer', 'enabled')
+    readonly_fields = ('cdn_prefix_id',)
 
 class ContentProviderInline(PlStackTabularInline):
     model = ContentProvider
     extra = 0
     suit_classes = 'suit-tab suit-tab-cps'
+    fields = ('content_provider_id', 'name', 'enabled')
+    readonly_fields = ('content_provider_id',)
 
 class ContentProviderROInline(ReadOnlyTabularInline):
     model = ContentProvider
@@ -51,7 +57,9 @@
 class OriginServerAdmin(ReadOnlyAwareAdmin):
     list_display = ('url','protocol','redirects','contentProvider','authenticated','enabled' )
 
-    user_readonly_fields = ('url','protocol','redirects','contentProvider','authenticated','enabled','origin_server_id','description','redirects','authenticated' )
+    fields = ('url','protocol','redirects','contentProvider','authenticated','enabled','origin_server_id','description' )
+    readonly_fields = ('origin_server_id',)
+    user_readonly_fields = ('url','protocol','redirects','contentProvider','authenticated','enabled','origin_server_id','description')
 
 class ContentProviderForm(forms.ModelForm):
     class Meta:
@@ -92,6 +100,7 @@
 class CDNPrefixAdmin(ReadOnlyAwareAdmin):
     form = CDNPrefixForm
     list_display = ['prefix','contentProvider']
+    fields = ['prefix', 'contentProvider', 'cdn_prefix_id', 'description', 'defaultOriginServer', 'enabled']
     user_readonly_fields = ['prefix','contentProvider', "cdn_prefix_id", "description", "defaultOriginServer", "enabled"]
 
 class SiteMapAdmin(ReadOnlyAwareAdmin):
diff --git a/planetstack/syndicate/admin.py b/planetstack/syndicate/admin.py
index fd306a2..4e83d4f 100644
--- a/planetstack/syndicate/admin.py
+++ b/planetstack/syndicate/admin.py
@@ -52,6 +52,7 @@
     formfield_overrides = {
         BitField: {'widget': BitFieldCheckboxSelectMultiple}
     }
+    fields = ('owner_id', 'gateway_caps')
 
 class VolumeInline(PlStackTabularInline):
     model = Volume