diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/.ratings
index 5cf9c3e4fe8ac87763b0fe17d561fea5d03f8c99..c1418705382e0c6496aa1679765ae2a8ea2fe2b0 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/.ratings
@@ -5,8 +5,8 @@ ConstraintUIService.java 308dc3df69cbd18a91a051038a77b6e1184937cc GREEN
 ContextMenuService.java ca3c899293f25b70ce8e5f0d86ca2f9683329d81 GREEN
 EditPartFactoryService.java e9180c0020f1769d9e24ef3c08f9ca5599dbc5c3 GREEN
 MarkerService.java b01b7706034691683df7bbc2e7828c42574b3147 GREEN
-ModelEditorBindingService.java 4c2b52008025db79b1ced4b695d60b561d17c51e GREEN
+ModelEditorBindingService.java 617e8e97705202f2e14521ad572da23beaf25c6c YELLOW
 ModelElementHandlerService.java 07a30545ad687ff0fe13bf7a9348c41fb03e0b2c GREEN
-NavigatorService.java 8ba9cec9ee7b3a73a47303575df917f47f2f7754 GREEN
+NavigatorService.java f859ca23525be3e931a61122152f58290fde53cc YELLOW
 ToolingKernelUIInternal.java 38903445a9084b7908716a00f41621dfb3126fca GREEN
 TutorialUIService.java b1d632eca91b4feb583f3930cd6ee4722dd9bfed GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java
index 4c2b52008025db79b1ced4b695d60b561d17c51e..617e8e97705202f2e14521ad572da23beaf25c6c 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java
@@ -164,7 +164,7 @@ public class ModelEditorBindingService extends EObjectAwareServiceBase<IModelEdi
 					ExtendableMultiPageEditor.ID);
 			currentEditors.put(part, element);
 			// ensure registration with part service
-			IPartService service = (IPartService)part.getSite().getService(IPartService.class);
+			IPartService service = part.getSite().getService(IPartService.class);
 			service.addPartListener(new EditorSitePartListener());
 			// ensure registration with command stack service
 			ITopLevelElement top = IPersistencyService.getInstance().getTopLevelElementFor(element);
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/NavigatorService.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/NavigatorService.java
index 8ba9cec9ee7b3a73a47303575df917f47f2f7754..f859ca23525be3e931a61122152f58290fde53cc 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/NavigatorService.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/NavigatorService.java
@@ -328,8 +328,8 @@ public class NavigatorService implements INavigatorService, IPersistencyServiceL
 	private void saveablesChanged(int event, ITopLevelElement element, boolean force) {
 		Saveable saveable = saveables.get(element);
 		if(saveable != null && navigatorViewPart != null) {
-			ISaveablesLifecycleListener listener = (ISaveablesLifecycleListener)PlatformUI
-					.getWorkbench().getService(ISaveablesLifecycleListener.class);
+			ISaveablesLifecycleListener listener =
+					PlatformUI.getWorkbench().getService(ISaveablesLifecycleListener.class);
 			SaveablesLifecycleEvent eventObj = new SaveablesLifecycleEvent(navigatorViewPart, event,
 					new Saveable[] {saveable}, force);
 			listener.handleLifecycleEvent(eventObj);
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings
index 1622ddcabe8f28b4dd05f8cf53453183ad1c4dce..0f4e43e66fd660b144f7ed90a4ab4f3d36906a81 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings
@@ -3,7 +3,7 @@ ConstraintsUIUtils.java 69d5e08bbf768baf2790380e36f1020ef826a33e GREEN
 CopyPasteUtils.java bbc5cf9c9dc03ebf8dc75d42c919fe6eb60b388e GREEN
 DataBindingUtils.java 4c2fc0bab9e9ea739411aa42f4a4393f1393396e RED
 DragAndDropUtils.java 7aab91518aa12d76533a345bf6ed0be9ac7ff0e5 GREEN
-EObjectSelectionUtils.java 928280b5dd3bb634debc1ac3be9f15b4e45f2683 GREEN
+EObjectSelectionUtils.java 128cf8f96c6b9478171dff3deda662d5934f5f44 YELLOW
 KernelUIUtils.java 46d3279ef3523b104f89a6c526109f72d36f72f2 GREEN
 ObservableUtils.java 34abfd1dfaf9c0acbb31caf1f525e7b39416c116 YELLOW
 PropertiesConstantUtils.java 59b1a1e4d594bb98db3aa396f2ff6474ba405920 GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/EObjectSelectionUtils.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/EObjectSelectionUtils.java
index 928280b5dd3bb634debc1ac3be9f15b4e45f2683..128cf8f96c6b9478171dff3deda662d5934f5f44 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/EObjectSelectionUtils.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/EObjectSelectionUtils.java
@@ -74,7 +74,7 @@ public final class EObjectSelectionUtils {
 			return (EObject)o;
 		}
 		if(o instanceof IAdaptable) {
-			return (EObject)((IAdaptable)o).getAdapter(EObject.class);
+			return ((IAdaptable)o).getAdapter(EObject.class);
 		}
 		return null;
 	}
@@ -115,7 +115,7 @@ public final class EObjectSelectionUtils {
 				if(eo != null) {
 					result.add(eo);
 				} else if(o instanceof IAdaptable) {
-					EObject eo2 = (EObject)((IAdaptable)o).getAdapter(EObject.class);
+					EObject eo2 = ((IAdaptable)o).getAdapter(EObject.class);
 					if(eo2 != null) {
 						result.add(eo2);
 					}