diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java
index 368697c7b85..73939e53ae4 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2003, 2016 IBM Corporation and others.
+ *  Copyright (c) 2003, 2017 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -254,20 +254,20 @@ public class Option extends BuildObject implements IOption, IBuildPropertiesRest
 			switch (vType) {
 			case BOOLEAN:
 				if (option.value != null) {
-					value = (Boolean)option.value;
+					value = option.value;
 				}
 				if (option.defaultValue != null) {
-					defaultValue = (Boolean)option.defaultValue;
+					defaultValue = option.defaultValue;
 				}
 				break;
 			case STRING:
 			case ENUMERATED:
 			case TREE:
 				if (option.value != null) {
-					value = (String)option.value;
+					value = option.value;
 				}
 				if (option.defaultValue != null) {
-					defaultValue = (String)option.defaultValue;
+					defaultValue = option.defaultValue;
 				}
 				break;
 			case STRING_LIST:
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java
index e20dc34ea54..b640724a53b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -128,7 +128,7 @@ public class OpenAction extends SelectionDispatchAction {
 			ICElement element= SelectionConverter.codeResolve(fEditor, getShell(), getDialogTitle(), 
 				ActionMessages.OpenAction_select_element);
 			if (element == null) {
-				IEditorStatusLine statusLine= (IEditorStatusLine) fEditor.getAdapter(IEditorStatusLine.class);
+				IEditorStatusLine statusLine= fEditor.getAdapter(IEditorStatusLine.class);
 				if (statusLine != null)
 					statusLine.setMessage(true, ActionMessages.OpenAction_error_messageBadSelection, null);
 				getShell().getDisplay().beep();