diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/META-INF/MANIFEST.MF b/tbr/org.eclipse.mylyn.reviews.tasks.core/META-INF/MANIFEST.MF
index ff23a6f..71f7b40 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.core/META-INF/MANIFEST.MF
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/META-INF/MANIFEST.MF
@@ -4,13 +4,13 @@
 Bundle-Vendor: Eclipse Mylyn
 Bundle-SymbolicName: org.eclipse.mylyn.reviews.tasks.core;singleton:=true
 Bundle-Version: 0.7.0.qualifier
-Require-Bundle: org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.resources;bundle-version="3.5.0",
+ org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.team.core;bundle-version="3.5.0",
- org.eclipse.core.resources;bundle-version="3.5.1",
- org.eclipse.mylyn.tasks.core;bundle-version="3.3.0",
  org.eclipse.compare;bundle-version="3.5.0",
+ org.eclipse.swt;bundle-version="3.5.0",
+ org.eclipse.mylyn.tasks.core,
  org.eclipse.mylyn.reviews.tasks.dsl;bundle-version="0.7.0",
- org.eclipse.swt;bundle-version="3.6.1",
  org.eclipse.mylyn.versions.core;bundle-version="0.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.mylyn.reviews.tasks.core,
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF
index 5d3a8ce..690e153 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@
 Bundle-Version: 0.7.0.qualifier
 Bundle-SymbolicName: org.eclipse.mylyn.reviews.tasks.dsl;singleton:=true
 Bundle-ActivationPolicy: lazy
-Import-Package: org.antlr.runtime;version="3.0.0",
- org.antlr.runtime.tree;version="3.0.0",
+Import-Package: org.antlr.runtime;version="[3.0.0,3.0.0]",
+ org.antlr.runtime.tree;version="[3.0.0,3.0.0]",
  org.apache.log4j
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.mylyn.reviews.tasks.dsl,
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslMapper.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslMapper.java
index 2f111f1..841283c 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslMapper.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslMapper.java
@@ -48,7 +48,6 @@
 	 * @see org.eclipse.mylyn.reviews.tasks.dsl.internal.IReviewDslMapper#
 	 * parseReviewResult(java.lang.String)
 	 */
-	@Override
 	public ReviewDslResult parseReviewResult(String text) throws ParseException {
 		ReviewDslLexer lexer = new ReviewDslLexer(new ANTLRStringStream(text));
 		TokenStream input = new CommonTokenStream(lexer);
@@ -127,7 +126,6 @@
 	 * @see org.eclipse.mylyn.reviews.tasks.dsl.internal.IReviewDslMapper#
 	 * parseReviewScope(java.lang.String)
 	 */
-	@Override
 	public ReviewDslScope parseReviewScope(String text) throws ParseException {
 		ReviewDslLexer lexer = new ReviewDslLexer(new ANTLRStringStream(text));
 		TokenStream input = new CommonTokenStream(lexer);
@@ -200,7 +198,6 @@
 		public String taskId;
 	}
 
-	@Override
 	public ReviewDslResult parseChangedReviewScope(String text) {
 		// TODO Auto-generated method stub
 		return null;
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslSerializer.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslSerializer.java
index 567758f..bc82277 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslSerializer.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslSerializer.java
@@ -25,14 +25,12 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.mylyn.reviews.tasks.dsl.internal.IReviewDslSerializer#serialize(org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslScope)
 	 */
-	@Override
 	public String serialize(ReviewDslScope scope) {
 		return scope.serialize(new StringBuilder()).toString();
 	}
 	/* (non-Javadoc)
 	 * @see org.eclipse.mylyn.reviews.tasks.dsl.internal.IReviewDslSerializer#serialize(org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslResult)
 	 */
-	@Override
 	public String serialize(ReviewDslResult result) {
 		return result.serialize(new StringBuilder()).toString();
 	}