diff --git a/core/src/main/java/hudson/ExtensionComponent.java b/core/src/main/java/hudson/ExtensionComponent.java
index 98e03969f3cc631ad458b9f5b276b9979d108728..d274e11204de3847f381d56c7672b1344bfd8199 100644
--- a/core/src/main/java/hudson/ExtensionComponent.java
+++ b/core/src/main/java/hudson/ExtensionComponent.java
@@ -88,8 +88,8 @@ public class ExtensionComponent<T> implements Comparable<ExtensionComponent<T>>
     public int compareTo(ExtensionComponent<T> that) {
         double a = this.ordinal();
         double b = that.ordinal();
-        if (a>b)    return -1;
-        if (a<b)    return 1;
+        if (Double.compare(a, b) > 0) return -1;
+        if (Double.compare(a, b) < 0) return 1;
 
         // make the order bit more deterministic among extensions of the same ordinal
         if (this.instance instanceof Descriptor && that.instance instanceof Descriptor) {
diff --git a/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java b/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java
index 332292912535905fa727f7e00e7d74eeb10528f0..a689a6e2e5f4040a33ff992bc82795e646a163db 100644
--- a/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java
+++ b/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java
@@ -1,5 +1,6 @@
 package hudson.cli;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.model.Job;
 import hudson.model.Run;
@@ -9,6 +10,9 @@ import java.io.Serializable;
 import org.apache.commons.io.IOUtils;
 import org.kohsuke.args4j.Argument;
 
+
+// TODO: Remove Serializable
+@SuppressFBWarnings(value = "SE_NO_SERIALVERSIONID", justification = "The Serializable should be removed.")
 @Extension
 public class SetBuildDescriptionCommand extends CLICommand implements Serializable {
 
diff --git a/core/src/main/java/hudson/model/FileParameterValue.java b/core/src/main/java/hudson/model/FileParameterValue.java
index 33336cd6b2f36ad009ec0fe8abd1337b5eff6aa1..4e059196e61c6f7ad2abdef12c4e51feb5d2ea03 100644
--- a/core/src/main/java/hudson/model/FileParameterValue.java
+++ b/core/src/main/java/hudson/model/FileParameterValue.java
@@ -67,6 +67,7 @@ import org.kohsuke.stapler.StaplerResponse;
 public class FileParameterValue extends ParameterValue {
     private static final String FOLDER_NAME = "fileParameters";
     private static final Pattern PROHIBITED_DOUBLE_DOT = Pattern.compile(".*[\\\\/]\\.\\.[\\\\/].*");
+    private static final long serialVersionUID = -143427023159076073L;
 
     /**
      * Escape hatch for SECURITY-1074, fileParameter used to escape their expected folder.
diff --git a/core/src/main/java/hudson/model/HealthReport.java b/core/src/main/java/hudson/model/HealthReport.java
index 7b675382723c64ae5051bd016bbcb9706f78cde5..6f82347b371fd0ac00ba2d4848c23fe0a1ab0321 100644
--- a/core/src/main/java/hudson/model/HealthReport.java
+++ b/core/src/main/java/hudson/model/HealthReport.java
@@ -63,6 +63,8 @@ public class HealthReport implements Serializable, Comparable<HealthReport> {
     private static final String HEALTH_UNKNOWN_IMG = "empty.png";
 
     private static final Map<String, String> iconIMGToClassMap = new HashMap<>();
+    private static final long serialVersionUID = 7451361788415642230L;
+
     static {
         iconIMGToClassMap.put(HEALTH_OVER_80_IMG, HEALTH_OVER_80);
         iconIMGToClassMap.put(HEALTH_61_TO_80_IMG, HEALTH_61_TO_80);
diff --git a/core/src/main/java/hudson/model/JDK.java b/core/src/main/java/hudson/model/JDK.java
index 2aaf9463d55334cf8259f9838dc5e35675fe6d96..9a243cb2ba1a977c4e541ede7b9055ef2c65341f 100644
--- a/core/src/main/java/hudson/model/JDK.java
+++ b/core/src/main/java/hudson/model/JDK.java
@@ -64,6 +64,7 @@ public final class JDK extends ToolInstallation implements NodeSpecific<JDK>, En
      * @since 1.577
      */
     public static final String DEFAULT_NAME = "(System)";
+    private static final long serialVersionUID = -3318291200160313357L;
 
     @Restricted(NoExternalUse.class)
     public static boolean isDefaultName(String name) {
diff --git a/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java b/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java
index b590dce40842558b814c84d65a179261b08374f7..4b86333f62d22f51980b043f11dc53e021fee445 100644
--- a/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java
+++ b/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java
@@ -105,16 +105,16 @@ public class HudsonAuthenticationEntryPoint extends AuthenticationProcessingFilt
                 "<meta http-equiv='refresh' content='1;url=%1$s'/>" +
                 "<script>window.location.replace('%1$s');</script>" +
                 "</head>" +
-                "<body style='background-color:white; color:white;'>\n" +
-                "\n\n"+
-                "Authentication required\n"+
-                "<!--\n",loginForm);
+                "<body style='background-color:white; color:white;'>%n" +
+                "%n%n"+
+                "Authentication required%n"+
+                "<!--%n",loginForm);
 
             if (cause!=null)
                 cause.report(out);
 
             out.printf(
-                "-->\n\n"+
+                "-->%n%n"+
                 "</body></html>");
             // Turn Off "Show Friendly HTTP Error Messages" Feature on the Server Side.
             // See http://support.microsoft.com/kb/294807
diff --git a/core/src/test/java/hudson/model/TaskActionTest.java b/core/src/test/java/hudson/model/TaskActionTest.java
index bfcf679cad252dc7064535afab115656c5dd7a94..0860e7cb49ac74e4dcd6a16e35ea4139d21adcbb 100644
--- a/core/src/test/java/hudson/model/TaskActionTest.java
+++ b/core/src/test/java/hudson/model/TaskActionTest.java
@@ -1,5 +1,6 @@
 package hudson.model;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayOutputStream;
@@ -58,7 +59,9 @@ public class TaskActionTest {
             Thread.sleep(10);
         }
         ByteArrayOutputStream os = new ByteArrayOutputStream();
-        annotatedText.writeLogTo(0, os);
+        final long length = annotatedText.writeLogTo(0, os);
+        // Windows based systems will be 220, linux base 219
+        assertTrue("length should be longer or even 219", length >= 219);
         assertTrue(os.toString("UTF-8").startsWith("a linkCompleted"));
     }
 }