diff --git a/ksql-common/pom.xml b/ksql-common/pom.xml
index fd059ec7b9c4..f62a908b2b43 100644
--- a/ksql-common/pom.xml
+++ b/ksql-common/pom.xml
@@ -39,6 +39,11 @@
             <artifactId>avro</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>annotations</artifactId>
+        </dependency>
+
         <!-- Required for running tests -->
 
         <dependency>
diff --git a/ksql-common/src/main/java/io/confluent/ksql/metrics/TopicSensors.java b/ksql-common/src/main/java/io/confluent/ksql/metrics/TopicSensors.java
index f0d472b47da8..70c8685e9cda 100644
--- a/ksql-common/src/main/java/io/confluent/ksql/metrics/TopicSensors.java
+++ b/ksql-common/src/main/java/io/confluent/ksql/metrics/TopicSensors.java
@@ -15,6 +15,7 @@
  **/
 package io.confluent.ksql.metrics;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.confluent.common.utils.Time;
 import org.apache.kafka.common.metrics.KafkaMetric;
 import org.apache.kafka.common.metrics.Metrics;
@@ -76,6 +77,8 @@ public Stat(String name, double value, long timestamp) {
       this.value = value;
       this.timestamp = timestamp;
     }
+
+    @SuppressFBWarnings("FE_FLOATING_POINT_EQUALITY")
     public String formatted() {
       if (value == Math.round(value)) {
         return String.format("%16s:%10.0f", name, value);
diff --git a/ksql-common/src/main/java/io/confluent/ksql/util/KsqlConstants.java b/ksql-common/src/main/java/io/confluent/ksql/util/KsqlConstants.java
index 6851d5150c07..96ce9483b825 100644
--- a/ksql-common/src/main/java/io/confluent/ksql/util/KsqlConstants.java
+++ b/ksql-common/src/main/java/io/confluent/ksql/util/KsqlConstants.java
@@ -28,14 +28,14 @@ public class KsqlConstants {
   public static final String SCHEMA_REGISTRY_VALUE_SUFFIX = "-value";
   public static final String AVRO_SCHEMA_ID = "AVRO_SCHEMA_ID";
 
-  public static int defaultSinkNumberOfPartitions = 4;
-  public static short defaultSinkNumberOfReplications = 1;
+  public static final int defaultSinkNumberOfPartitions = 4;
+  public static final short defaultSinkNumberOfReplications = 1;
   // TODO: Find out the best default value.
-  public static long defaultSinkWindowChangeLogAdditionalRetention = 1000000;
+  public static final long defaultSinkWindowChangeLogAdditionalRetention = 1000000;
 
-  public static String defaultAutoOffsetRestConfig = "latest";
-  public static long defaultCommitIntervalMsConfig = 2000;
-  public static long defaultCacheMaxBytesBufferingConfig = 10000000;
-  public static int defaultNumberOfStreamsThreads = 4;
+  public static final String defaultAutoOffsetRestConfig = "latest";
+  public static final long defaultCommitIntervalMsConfig = 2000;
+  public static final long defaultCacheMaxBytesBufferingConfig = 10000000;
+  public static final int defaultNumberOfStreamsThreads = 4;
 
 }
diff --git a/ksql-rest-app/src/main/java/io/confluent/ksql/rest/entity/SourceDescription.java b/ksql-rest-app/src/main/java/io/confluent/ksql/rest/entity/SourceDescription.java
index 7580ded8626d..bea69b7d6083 100644
--- a/ksql-rest-app/src/main/java/io/confluent/ksql/rest/entity/SourceDescription.java
+++ b/ksql-rest-app/src/main/java/io/confluent/ksql/rest/entity/SourceDescription.java
@@ -121,8 +121,8 @@ public SourceDescription(StructuredDataSource dataSource, boolean extended, Stri
         dataSource.getKsqlTopic().getKafkaTopicName(),
         topology,
         executionPlan,
-        (extended & topicClient != null ? getPartitions(topicClient,  dataSource.getKsqlTopic().getKafkaTopicName()) : 0),
-        (extended & topicClient != null ? getReplication(topicClient, dataSource.getKsqlTopic().getKafkaTopicName()) : 0)
+        (extended && topicClient != null ? getPartitions(topicClient,  dataSource.getKsqlTopic().getKafkaTopicName()) : 0),
+        (extended && topicClient != null ? getReplication(topicClient, dataSource.getKsqlTopic().getKafkaTopicName()) : 0)
     );
   }
   public SourceDescription(KsqlStructuredDataOutputNode outputNode, String statementString, String name, String topoplogy, String executionPlan, KafkaTopicClient topicClient) {
diff --git a/ksql-version-metrics-client/src/main/java/io/confluent/ksql/version/metrics/KsqlVersionCheckerResponseHandler.java b/ksql-version-metrics-client/src/main/java/io/confluent/ksql/version/metrics/KsqlVersionCheckerResponseHandler.java
index b7aa26df6465..132d1fc9effc 100644
--- a/ksql-version-metrics-client/src/main/java/io/confluent/ksql/version/metrics/KsqlVersionCheckerResponseHandler.java
+++ b/ksql-version-metrics-client/src/main/java/io/confluent/ksql/version/metrics/KsqlVersionCheckerResponseHandler.java
@@ -25,6 +25,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 
 import io.confluent.support.metrics.submitters.ResponseHandler;
 
@@ -38,8 +39,9 @@ public void handle(HttpResponse response) {
     try {
       if (statusCode == HttpStatus.SC_OK && response.getEntity().getContent() != null) {
 
-        BufferedReader br =
-            new BufferedReader(new InputStreamReader((response.getEntity().getContent())));
+        BufferedReader br = new BufferedReader(
+            new InputStreamReader((response.getEntity().getContent()), StandardCharsets.UTF_8)
+        );
 
         StringBuilder content = new StringBuilder();
         String line;