diff --git a/conf/checkstyle/onos_suppressions.xml b/conf/checkstyle/onos_suppressions.xml
index 53f456e..a32b222 100644
--- a/conf/checkstyle/onos_suppressions.xml
+++ b/conf/checkstyle/onos_suppressions.xml
@@ -10,6 +10,7 @@
     <suppress files="edu.stanford.ramcloud.*" checks="[_a-zA-Z0-9]*"/>
     <suppress files="net.floodlightcontroller.*" checks="[_a-zA-Z0-9]*"/>
     <suppress files="org.openflow.*" checks="[_a-zA-Z0-9]*"/>
+    <suppress files="net.onrc.onos.core.datastore.serializers.*" checks="[_a-zA-Z0-9]*"/>
 
     <suppress files=".*" checks="FinalParametersCheck"/>
     <suppress files=".*" checks="MagicNumbersCheck"/>
diff --git a/conf/checkstyle/sun_checks.xml b/conf/checkstyle/sun_checks.xml
index 975350e..0f685fa 100644
--- a/conf/checkstyle/sun_checks.xml
+++ b/conf/checkstyle/sun_checks.xml
@@ -170,33 +170,18 @@
 
         <!-- Checks for whitespace                               -->
         <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad">
-          <property name="severity" value="warning"/>
-        </module>
-
+        <module name="EmptyForIteratorPad"/>
         <module name="GenericWhitespace"/>
         <module name="MethodParamPad"/>
-
-        <module name="NoWhitespaceAfter">
-          <property name="severity" value="warning"/>
-        </module>
-
-        <module name="NoWhitespaceBefore">
-          <property name="severity" value="warning"/>
-        </module>
+        <module name="NoWhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
 
         <!-- Disabled for ONOS.  Default rules specify undesired behavior for the '?' operator -->
         <!-- <module name="OperatorWrap"/> -->
         <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
-
-        <module name="WhitespaceAfter">
-          <property name="severity" value="warning"/>
-        </module>
-
-        <module name="WhitespaceAround">
-          <property name="severity" value="warning"/>
-        </module>
+        <module name="WhitespaceAfter"/>
+        <module name="WhitespaceAround"/>