diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java
index ef7515c7f..4700edd40 100644
--- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java
+++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java
@@ -145,7 +145,7 @@ public abstract class AbstractScriptModuleHandler<T extends Module> extends Base
      * 
      * @return the type identifier
      */
-    abstract public String getTypeId();
+    public abstract String getTypeId();
 
     /**
      * Gets the script engine identifier for this module
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java
index 08c463b01..2ab6d84c7 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java
@@ -289,7 +289,7 @@ public class SemanticsServiceImpl implements SemanticsService, RegistryChangeLis
      * @return true if the semantics are valid, false otherwise
      */
     boolean checkSemantics(Item item) {
-        return getItemSemanticsProblems(item, true).size() == 0 ? true : false;
+        return getItemSemanticsProblems(item, true).isEmpty();
     }
 
     @Override
diff --git a/bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/thing/channel-types.xml b/bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/thing/channel-types.xml
index 8615a04f4..76d6a8e39 100644
--- a/bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/thing/channel-types.xml
+++ b/bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/thing/channel-types.xml
@@ -33,7 +33,7 @@
 		</description>
 		<category>ColorLight</category>
 		<tags>
-			<tag>Lighting</tag>
+			<tag>Light</tag>
 		</tags>
 		<autoUpdatePolicy>recommend</autoUpdatePolicy>
 		<config-description>
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarker.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarker.java
index 3cb36eb46..879d4f7c5 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarker.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarker.java
@@ -75,10 +75,7 @@ public final class ReadyMarker {
         if (!identifier.equals(other.identifier)) {
             return false;
         }
-        if (!type.equals(other.type)) {
-            return false;
-        }
-        return true;
+        return type.equals(other.type);
     }
 
     @Override