diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index 732028f8..17cad182 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -41,7 +41,9 @@
     <module name="TreeWalker">
         <!-- Blocks -->
         <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock"/>
+        <module name="EmptyBlock">
+            <property name="option" value="text"/>
+        </module>
         <module name="EmptyCatchBlock">
             <property name="exceptionVariableName" value="expected|ignore"/>
         </module>
@@ -64,7 +66,6 @@
         </module>
         <module name="DefaultComesLast"/>
         <module name="EmptyStatement"/>
-        <module name="EqualsAvoidNull"/>
         <module name="EqualsHashCode"/>
         <module name="FallThrough"/>
         <module name="IllegalThrows"/>
@@ -159,7 +160,8 @@
 
         <!-- Whitespace -->
         <module name="RegexpSinglelineJava">
-            <property name="format" value="[^\s]\s+$"/>
+            <!-- Tolerate one trailing space, except immediately after curly braces, left parenthesis and semicolon -->
+            <property name="format" value="([^\s]\s{2,}|[}{(;]\s+)$"/>
             <property name="minimum" value="0"/>
             <property name="maximum" value="0"/>
             <property name="ignoreComments" value="true"/>
diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml
index 7e0a4e0f..8f9b8ffc 100644
--- a/checkstyle/suppressions.xml
+++ b/checkstyle/suppressions.xml
@@ -10,4 +10,10 @@
     <suppress
             checks="Header"
             files="[\\/]me[\\/]filoghost[\\/]holographicdisplays[\\/]bridge[\\/]protocollib[\\/].+\.java"/>
+    <suppress
+            checks="LeftCurly|EmptyLineSeparator"
+            files="[\\/]me[\\/]filoghost[\\/]holographicdisplays[\\/]nms[\\/]\w+[\\/]Craft.+\.java"/>
+    <suppress
+            checks="SummaryJavadoc"
+            files="[\\/]com[\\/]gmail[\\/]filoghost[\\/](holograms|holographicdisplays)[\\/]api[\\/].+\.java"/>
 </suppressions>
diff --git a/pom.xml b/pom.xml
index 618cbb1e..9d64b746 100644
--- a/pom.xml
+++ b/pom.xml
@@ -374,6 +374,7 @@
                     </dependency>
                 </dependencies>
                 <configuration>
+                    <consoleOutput>true</consoleOutput>
                     <configLocation>${rootDir}/checkstyle/checkstyle.xml</configLocation>
                     <propertyExpansion>samedir=${rootDir}/checkstyle</propertyExpansion>
                     <sourceDirectories>