diff --git a/pom.xml b/pom.xml
index 31db9d1..1a359df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.apache.taverna</groupId>
 		<artifactId>taverna-parent</artifactId>
-		<version>1-incubating-SNAPSHOT</version>
+		<version>2-incubating-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.apache.taverna.workbench</groupId>
@@ -125,19 +125,19 @@
         </plugins>
     </build>
     <repositories>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://repository.apache.org/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>ice-maven-release</id>
-      <name>Ice Maven Release Repository</name>
-      <url>http://anonsvn.icesoft.org/repo/maven2/releases/</url>
-    </repository>
-  </repositories>
+        <repository>
+            <id>apache.snapshots</id>
+            <name>Apache Snapshot Repository</name>
+            <url>http://repository.apache.org/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+        <repository>
+            <id>ice-maven-release</id>
+            <name>Ice Maven Release Repository</name>
+            <url>http://anonsvn.icesoft.org/repo/maven2/releases/</url>
+        </repository>
+    </repositories>
 
 </project>
diff --git a/taverna-contextual-views-impl/src/main/java/org/apache/taverna/workbench/ui/views/contextualviews/annotated/AnnotatedContextualView.java b/taverna-contextual-views-impl/src/main/java/org/apache/taverna/workbench/ui/views/contextualviews/annotated/AnnotatedContextualView.java
index f912549..d58a29d 100644
--- a/taverna-contextual-views-impl/src/main/java/org/apache/taverna/workbench/ui/views/contextualviews/annotated/AnnotatedContextualView.java
+++ b/taverna-contextual-views-impl/src/main/java/org/apache/taverna/workbench/ui/views/contextualviews/annotated/AnnotatedContextualView.java
@@ -61,7 +61,7 @@
  * @author Alan R Williams
  */
 @SuppressWarnings("serial")
-class AnnotatedContextualView extends ContextualView {
+public class AnnotatedContextualView extends ContextualView {
 	private static final int WORKFLOW_NAME_LENGTH = 20;
 	public static final String VIEW_TITLE = "Annotations";
 	private final static String MISSING_VALUE = "Type here to give details";
diff --git a/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/annotated/AnnotatedConfigureMenuAction.java b/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/annotated/AnnotatedConfigureMenuAction.java
index 61087cb..3d7c774 100644
--- a/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/annotated/AnnotatedConfigureMenuAction.java
+++ b/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/annotated/AnnotatedConfigureMenuAction.java
@@ -33,7 +33,7 @@
 import org.apache.taverna.ui.menu.items.contextualviews.ConfigureSection;
 import org.apache.taverna.workbench.edits.EditManager;
 import org.apache.taverna.workbench.selection.SelectionManager;
-//import net.sf.taverna.t2.workbench.ui.views.contextualviews.annotated.AnnotatedContextualView;
+import org.apache.taverna.workbench.ui.views.contextualviews.annotated.AnnotatedContextualView;
 
 public class AnnotatedConfigureMenuAction extends AbstractContextualMenuAction {
 	private static final String ANNOTATE = "Annotate...";
diff --git a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/processor/RenderedProcessorResultComponent.java b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/processor/RenderedProcessorResultComponent.java
index ae642cd..c83dbd5 100644
--- a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/processor/RenderedProcessorResultComponent.java
+++ b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/processor/RenderedProcessorResultComponent.java
@@ -25,7 +25,7 @@
 import static java.awt.event.ItemEvent.SELECTED;
 import static javax.swing.BoxLayout.LINE_AXIS;
 import static javax.swing.SwingUtilities.invokeLater;
-import static net.sf.taverna.t2.results.ResultsUtils.getMimeTypes;
+import static org.apache.taverna.results.ResultsUtils;
 import static org.apache.taverna.workbench.icons.WorkbenchIcons.refreshIcon;
 import static org.apache.taverna.workbench.views.results.processor.ProcessorResultTreeNode.ProcessorResultTreeNodeState.RESULT_REFERENCE;
 import static org.apache.commons.lang.StringEscapeUtils.escapeHtml;