--- eclipse.platform.debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java.bak	2012-07-30 14:27:39.000000000 +0200
+++ eclipse.platform.debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java	2012-07-30 14:28:00.277726901 +0200
@@ -182,7 +182,7 @@
 					}
 					int cmp;
 					if (num1 instanceof Long && num2 instanceof Long) {
-						cmp = ((Long)num1).compareTo(num2);
+						cmp = ((Long)num1).compareTo((Long)num2);
 					} else {
 						cmp = Double.compare(num1.doubleValue(), num2.doubleValue());
 					}
--- eclipse.platform.debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java.bak	2012-07-25 17:26:39.000000000 +0200
+++ eclipse.platform.debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java	2012-07-30 15:09:46.416687878 +0200
@@ -853,7 +853,7 @@
 	 */
 	private boolean isEnabled(Object element) {
 		if (element instanceof ICommand) {
-			Boolean enabled= (Boolean)((ICommand) element).getArguments().get(COMMAND_ENABLED);
+			Boolean enabled= (Boolean)(Object)((ICommand) element).getArguments().get(COMMAND_ENABLED);
 			if (enabled != null) {
 				return enabled.booleanValue();
 			}