diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRunControlNS.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRunControlNS.java
index a90849c1d9a..2cf99a6cea6 100644
--- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRunControlNS.java
+++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRunControlNS.java
@@ -91,23 +91,23 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
 	 * @see MIRunControl
 	 */
 	@Immutable
-	private static class RunControlEvent<V extends IDMContext, T extends MIEvent<? extends IDMContext>> extends AbstractDMEvent<V>
-	implements IDMEvent<V>, IMIDMEvent
+	private static class RunControlEvent<V extends IDMContext, T extends IDMContext> extends AbstractDMEvent<V>
+	implements IDMEvent<V>, IMIDMEvent<T>
 	{
-		final private T fMIInfo;
-		public RunControlEvent(V dmc, T miInfo) {
+		final private MIEvent<T> fMIInfo;
+		public RunControlEvent(V dmc, MIEvent<T> miInfo) {
 			super(dmc);
 			fMIInfo = miInfo;
 		}
 
-		public T getMIEvent() { return fMIInfo; }
+		public MIEvent<T> getMIEvent() { return fMIInfo; }
 	}
 
 	/**
 	 * Indicates that the given thread has been suspended.
 	 */
 	@Immutable
-	private static class SuspendedEvent extends RunControlEvent<IExecutionDMContext, MIStoppedEvent>
+	private static class SuspendedEvent extends RunControlEvent<IExecutionDMContext, IExecutionDMContext>
 	implements ISuspendedDMEvent
 	{
 		SuspendedEvent(IExecutionDMContext ctx, MIStoppedEvent miInfo) {
@@ -150,7 +150,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
 //	}
 
 	@Immutable
-	private static class ResumedEvent extends RunControlEvent<IExecutionDMContext, MIRunningEvent>
+	private static class ResumedEvent extends RunControlEvent<IExecutionDMContext, IExecutionDMContext>
 	implements IResumedDMEvent
 	{
 		ResumedEvent(IExecutionDMContext ctx, MIRunningEvent miInfo) {
@@ -158,7 +158,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
 		}
 
 		public StateChangeReason getReason() {
-			switch(getMIEvent().getType()) {
+			switch(((MIRunningEvent)getMIEvent()).getType()) {
 			case MIRunningEvent.CONTINUE:
 				return StateChangeReason.USER_REQUEST;
 			case MIRunningEvent.NEXT:
@@ -195,7 +195,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
 //	}
 
 	@Immutable
-	private static class StartedDMEvent extends RunControlEvent<IExecutionDMContext,MIThreadCreatedEvent>
+	private static class StartedDMEvent extends RunControlEvent<IExecutionDMContext, IContainerDMContext>
 	implements IStartedDMEvent
 	{
 		StartedDMEvent(IMIExecutionDMContext executionDmc, MIThreadCreatedEvent miInfo) {
@@ -204,7 +204,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
 	}
 
 	@Immutable
-	private static class ExitedDMEvent extends RunControlEvent<IExecutionDMContext,MIThreadExitEvent>
+	private static class ExitedDMEvent extends RunControlEvent<IExecutionDMContext, IContainerDMContext>
 	implements IExitedDMEvent
 	{
 		ExitedDMEvent(IMIExecutionDMContext executionDmc, MIThreadExitEvent miInfo) {