diff --git a/security/src/main/java/org/apache/hadoop/hbase/security/HBasePolicyProvider.java b/security/src/main/java/org/apache/hadoop/hbase/security/HBasePolicyProvider.java
index 0c4b4cbbaee..fda40cc1876 100644
--- a/security/src/main/java/org/apache/hadoop/hbase/security/HBasePolicyProvider.java
+++ b/security/src/main/java/org/apache/hadoop/hbase/security/HBasePolicyProvider.java
@@ -19,8 +19,8 @@ package org.apache.hadoop.hbase.security;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.ipc.HMasterInterface;
-import org.apache.hadoop.hbase.ipc.HMasterRegionInterface;
 import org.apache.hadoop.hbase.ipc.HRegionInterface;
+import org.apache.hadoop.hbase.ipc.RegionServerStatusProtocol;
 import org.apache.hadoop.security.authorize.PolicyProvider;
 import org.apache.hadoop.security.authorize.Service;
 import org.apache.hadoop.security.authorize.ServiceAuthorizationManager;
@@ -33,7 +33,7 @@ public class HBasePolicyProvider extends PolicyProvider {
   protected static Service[] services = {
       new Service("security.client.protocol.acl", HRegionInterface.class),
       new Service("security.admin.protocol.acl", HMasterInterface.class),
-      new Service("security.masterregion.protocol.acl", HMasterRegionInterface.class)
+      new Service("security.masterregion.protocol.acl", RegionServerStatusProtocol.class)
   };
 
   @Override
diff --git a/src/main/resources/hbase-webapps/master/table.jsp b/src/main/resources/hbase-webapps/master/table.jsp
index ca7310c0d07..cbde4dfbe18 100644
--- a/src/main/resources/hbase-webapps/master/table.jsp
+++ b/src/main/resources/hbase-webapps/master/table.jsp
@@ -19,19 +19,14 @@
 --%>
 <%@ page contentType="text/html;charset=UTF-8"
   import="java.util.HashMap"
-  import="org.apache.hadoop.io.Writable"
   import="org.apache.hadoop.conf.Configuration"
   import="org.apache.hadoop.hbase.client.HTable"
   import="org.apache.hadoop.hbase.client.HBaseAdmin"
   import="org.apache.hadoop.hbase.client.HConnectionManager"
   import="org.apache.hadoop.hbase.HRegionInfo"
   import="org.apache.hadoop.hbase.ServerName"
-  import="org.apache.hadoop.hbase.HServerAddress"
-  import="org.apache.hadoop.hbase.ServerName"
-  import="org.apache.hadoop.hbase.HServerInfo"
-  import="org.apache.hadoop.hbase.ServerLoad;"
+  import="org.apache.hadoop.hbase.ServerLoad"
   import="org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad"
-  import="org.apache.hadoop.hbase.io.ImmutableBytesWritable"
   import="org.apache.hadoop.hbase.master.HMaster" 
   import="org.apache.hadoop.hbase.util.Bytes"
   import="org.apache.hadoop.hbase.util.FSUtils"