diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 1a086c49c..fd1fa3897 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -43,7 +43,7 @@
     </module>
     <module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
         <property name="max" value="120"/>
-        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|\{@link"/>
     </module>
     <module name="TreeWalker">
         <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
@@ -402,7 +402,9 @@
             <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
             <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
-        <module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
+        <module name="CyclomaticComplexity"> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
+            <property name="switchBlockAsSingleDecisionPoint" value="true"/>
+        </module>
         <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
             <property name="ignoredAnnotations" value="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
         </module>
diff --git a/build.gradle b/build.gradle
index 974cf4a9c..f22da087b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath 'com.gradle.publish:plugin-publish-plugin:1.0.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:4.145.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:4.181.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.11.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.15.0'
diff --git a/idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirCodeStyleManager.java b/idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirCodeStyleManager.java
index dcbe737b4..ffa3a5b31 100644
--- a/idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirCodeStyleManager.java
+++ b/idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirCodeStyleManager.java
@@ -85,7 +85,7 @@ static Map<TextRange, String> getReplacements(
             formatter.getFormatReplacements(text, toRanges(ranges)).forEach(replacement -> {
                 replacements.put(toTextRange(replacement.getReplaceRange()), replacement.getReplacementString());
             });
-            return replacements.build();
+            return replacements.buildOrThrow();
         } catch (FormatterException e) {
             log.debug("Formatter failed, no replacements", e);
             return ImmutableMap.of();
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInput.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInput.java
index 7d348a0af..1621efbf1 100644
--- a/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInput.java
+++ b/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInput.java
@@ -307,7 +307,7 @@ private static ImmutableMap<Integer, Integer> makePositionToColumnMap(List<Tok>
         for (Tok tok : toks) {
             builder.put(tok.getPosition(), tok.getColumn());
         }
-        return builder.build();
+        return builder.buildOrThrow();
     }
 
     /**