diff --git a/conf/checkstyle/onos_suppressions.xml b/conf/checkstyle/onos_suppressions.xml
index a32b222..9728687 100644
--- a/conf/checkstyle/onos_suppressions.xml
+++ b/conf/checkstyle/onos_suppressions.xml
@@ -12,6 +12,10 @@
     <suppress files="org.openflow.*" checks="[_a-zA-Z0-9]*"/>
     <suppress files="net.onrc.onos.core.datastore.serializers.*" checks="[_a-zA-Z0-9]*"/>
 
+    <!-- BigSwitch packet code is designed to use parameter names that override
+         local member names -->
+    <suppress files="net.onrc.onos.core.packet.*" checks="HiddenField"/>
+
     <suppress files=".*" checks="FinalParametersCheck"/>
     <suppress files=".*" checks="MagicNumbersCheck"/>
     <suppress files=".*" checks="DesignForExtensionCheck"/>
diff --git a/conf/checkstyle/sun_checks.xml b/conf/checkstyle/sun_checks.xml
index 412842c..9460b7c 100644
--- a/conf/checkstyle/sun_checks.xml
+++ b/conf/checkstyle/sun_checks.xml
@@ -88,8 +88,13 @@
     <!--   <property name="fileExtensions" value="java"/> -->
     <!-- </module> -->
 
+    <module name="SuppressionCommentFilter">
+       <property name="offCommentFormat" value="CHECKSTYLE:OFF"/>
+       <property name="onCommentFormat" value="CHECKSTYLE:ON"/>
+    </module>
     <module name="TreeWalker">
 
+        <module name="FileContentsHolder"/>
         <!-- Checks for Javadoc comments.                     -->
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
         <module name="JavadocMethod">
@@ -196,7 +201,8 @@
         <module name="EqualsHashCode"/>
 
         <module name="HiddenField">
-          <property name="severity" value="warning"/>
+          <property name="ignoreSetter" value="true"/>
+	  <property name="ignoreConstructorParameter" value="true"/>
         </module>
 
         <module name="IllegalInstantiation"/>