diff --git a/build.xml b/build.xml
index 79d64b1f1c29c68f6cfd490e8e6a9942f1463856..0a3eb4bcdf095b74b5a1eb32ba8d19bbc63b33c9 100644
--- a/build.xml
+++ b/build.xml
@@ -283,10 +283,12 @@
     <target name="findbugs-xml" depends="init,compile">
         <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.home}/lib/findbugs-ant.jar"/>
         <mkdir dir="${findbugs.results}"/>
-        <findbugs home="${findbugs.home}"
+        <findbugs
+            home="${findbugs.home}"
             output="xml"
             excludeFilter="${basedir}/findbugs-exclude.xml"
-            outputFile="${findbugs.results}/results.xml" reportLevel='high'>
+            jvmargs="-Xmx1024m"
+            outputFile="${findbugs.results}/results.xml">
            <sourcePath path="${source}" />
            <sourcePath path="${thrift.out.dir}" />
            <class location="${build}" />
@@ -299,9 +301,11 @@
     <target name="findbugs" depends="init,compile">
         <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.home}/lib/findbugs-ant.jar"/>
         <mkdir dir="${findbugs.results}"/>
-        <findbugs home="${findbugs.home}"
+        <findbugs
+            home="${findbugs.home}"
             output="html"
             excludeFilter="${basedir}/findbugs-exclude.xml"
+            jvmargs="-Xmx1024m"
             outputFile="${findbugs.results}/results.html" >
            <sourcePath path="${source}" />
            <sourcePath path="${thrift.out.dir}" />
diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
index 33284dbb61d7fc1c607727c55fbe2c93b9b3578f..9baffdda0e4c7805c197c34025aae9274b3a0075 100644
--- a/findbugs-exclude.xml
+++ b/findbugs-exclude.xml
@@ -1,10 +1,14 @@
 <FindBugsFilter>
     <!--- Checks disabled on generated code -->
+
     <Match>
         <!-- don't complain about switch statements / external representation exposed
              by generated parser files -->
         <Class name="~net\.bigdb\.(query|yang)\.parser\..*(Lexer|Parser)" />
-        <Bug pattern="SF_SWITCH_NO_DEFAULT,EI_EXPOSE_REP" />
+        <Or>
+            <Bug pattern="SF_SWITCH_NO_DEFAULT,EI_EXPOSE_REP,SBSC_USE_STRINGBUFFER_CONCATENATION" />
+            <Bug category="PERFORMANCE,MALICIOUS_CODE" />
+        </Or>
     </Match>
 
     <Match>