diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/Algorithm.h b/Code/Mantid/Framework/API/inc/MantidAPI/Algorithm.h
index 92cf065c649776c8cb7bcce8584160bcfebbf8eb..b8ce6587e61b01f152d3c3181de589ccc615f6b4 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/Algorithm.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/Algorithm.h
@@ -46,10 +46,6 @@
 #include <map>
 #include <cmath>
 
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
-
 namespace Mantid
 {
 namespace API
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmProxy.h b/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmProxy.h
index 3f9f92f1cbbc83756d947a9093b54651ed1d3a91..885153d7344887c4a2e44311d3f3775e16c4b11f 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmProxy.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmProxy.h
@@ -13,10 +13,6 @@
   #pragma warning( disable: 4250 ) // Disable warning regarding inheritance via dominance, we have no way around it with the design
 #endif
 
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
-
 namespace Poco
 {
   class Void;
diff --git a/Code/Mantid/Framework/Algorithms/src/CreateWorkspace.cpp b/Code/Mantid/Framework/Algorithms/src/CreateWorkspace.cpp
index 914c83c8594d76c74fd68b12593787772823eaf9..e362a024aa676301ddeaee79fdbafb094f980b33 100644
--- a/Code/Mantid/Framework/Algorithms/src/CreateWorkspace.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/CreateWorkspace.cpp
@@ -129,6 +129,8 @@ void CreateWorkspace::exec()
   // Create the OutputWorkspace
   MatrixWorkspace_sptr outputWS = WorkspaceFactory::Instance().create("Workspace2D", nSpec, xSize, ySize);
 
+  Progress progress(this,0,1,nSpec);
+
   PARALLEL_FOR1(outputWS)
   for ( int i = 0; i < nSpec; i++ )
   {
@@ -153,6 +155,7 @@ void CreateWorkspace::exec()
 
     if ( dataE_provided) outputWS->dataE(i).assign(dataE.begin()+yStart,dataE.begin()+yEnd);
 
+    progress.report();
     PARALLEL_END_INTERUPT_REGION
   }
   PARALLEL_CHECK_INTERUPT_REGION
diff --git a/Code/Mantid/MantidPlot/CMakeLists.txt b/Code/Mantid/MantidPlot/CMakeLists.txt
index 889fff3e35745b60343cf6c00fcf509fcfec2e07..191f634398381b1a712de91820c771fd34e4f5a7 100644
--- a/Code/Mantid/MantidPlot/CMakeLists.txt
+++ b/Code/Mantid/MantidPlot/CMakeLists.txt
@@ -717,7 +717,7 @@ include_directories ( src )
 include_directories ( src/lib/include )
 include_directories ( src/lib/3rdparty/qtcolorpicker/src )
 
-set ( SRC_FILES ${QTIPLOT_SRCS} ${QT_SOLUTIONS_SRCS} ${MANTID_SRCS} ${SIP_SRC} )
+set ( SRC_FILES ${QTIPLOT_SRCS} ${MANTID_SRCS} ${SIP_SRC} )
 set ( INC_FILES ${QTIPLOT_HDRS} ${MANTID_HDRS} )
 
 ###########################################################################