diff --git a/Plugins/org.mitk.gui.qt.matchpoint.algorithm.browser/src/internal/QmitkMatchPointBrowser.cpp b/Plugins/org.mitk.gui.qt.matchpoint.algorithm.browser/src/internal/QmitkMatchPointBrowser.cpp
index 88b43797b3..1c7032649a 100644
--- a/Plugins/org.mitk.gui.qt.matchpoint.algorithm.browser/src/internal/QmitkMatchPointBrowser.cpp
+++ b/Plugins/org.mitk.gui.qt.matchpoint.algorithm.browser/src/internal/QmitkMatchPointBrowser.cpp
@@ -1,264 +1,264 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "org_mitk_gui_qt_matchpoint_algorithm_browser_Activator.h"
 
 // Blueberry
 #include <berryISelectionService.h>
 #include <berryIWorkbenchWindow.h>
 #include <berryPlatform.h>
 
 // Qmitk
 #include "QmitkMatchPointBrowser.h"
 
 // Qt
 #include <QMessageBox>
 #include <QErrorMessage>
 #include <QDir>
 #include <QStringList>
 
 //MITK
 #include <mitkStatusBar.h>
 #include "MatchPointBrowserConstants.h"
 #include "mitkAlgorithmInfoSelectionProvider.h"
 
 // MatchPoint
 #include <mapRegistrationAlgorithmInterface.h>
 #include <mapAlgorithmEvents.h>
 #include <mapAlgorithmWrapperEvent.h>
 #include <mapExceptionObjectMacros.h>
 #include <mapDeploymentDLLDirectoryBrowser.h>
 
 const std::string QmitkMatchPointBrowser::VIEW_ID = "org.mitk.views.matchpoint.algorithm.browser";
 
 QmitkMatchPointBrowser::QmitkMatchPointBrowser()
     : m_Parent(nullptr), m_LoadedDLLHandle(nullptr), m_LoadedAlgorithm(nullptr)
 {
 }
 
 QmitkMatchPointBrowser::~QmitkMatchPointBrowser()
 {
 }
 
 void QmitkMatchPointBrowser::OnPreferencesChanged(const berry::IBerryPreferences* /*prefs*/)
 {
     this->OnSearchFolderButtonPushed();
 }
 
 void QmitkMatchPointBrowser::CreateConnections()
 {
     connect(m_Controls.m_pbSearchFolder, SIGNAL(clicked()), this, SLOT(OnSearchFolderButtonPushed()));
     connect(m_Controls.m_algoTreeView, SIGNAL(clicked(const QModelIndex&)), this,
         SLOT(OnAlgoListSelectionChanged(const QModelIndex&)));
     connect(m_Controls.pbClearSearch, SIGNAL(clicked()), m_Controls.lineSearch, SLOT(clear()));
     connect(m_Controls.lineSearch, SIGNAL(textChanged(const QString&)), this,
         SLOT(OnSearchChanged(const QString&)));
 }
 
 void QmitkMatchPointBrowser::OnSearchFolderButtonPushed()
 {
     RetrieveAndStorePreferenceValues();
     // test if some folder list non-empty
     int folderCount = m_currentSearchPaths.count();
 
     if (!folderCount)
     {
         Error(QString("No search folder selected for MatchPoint algorithm browser! Please set search paths in the MatchPoint preference page."));
         m_DLLInfoList.clear();
     }
     else
     {
         map::deployment::DLLDirectoryBrowser::Pointer browser = map::deployment::DLLDirectoryBrowser::New();
 
         foreach(QString path, m_currentSearchPaths)
         {
             browser->addDLLSearchLocation(path.toStdString());
         }
 
         browser->update();
         m_DLLInfoList = browser->getLibraryInfos();
     }
 
     m_Controls.groupWarning->setVisible(m_DLLInfoList.empty());
     m_Controls.groupList->setVisible(!m_DLLInfoList.empty());
 
     m_algModel->SetAlgorithms(m_DLLInfoList);
     m_Controls.lineSearch->clear();
 }
 
 void QmitkMatchPointBrowser::OnAlgoListSelectionChanged(const QModelIndex& index)
 {
     QVariant vIndex = index.data(Qt::UserRole).toInt();
     map::deployment::DLLInfo::ConstPointer currentItemInfo = nullptr;
 
     if (vIndex.isValid())
     {
-        int algListIndex = vIndex.toInt();
+        std::size_t algListIndex = vIndex.toInt();
 
         if (algListIndex < m_DLLInfoList.size())
         {
             currentItemInfo = m_DLLInfoList[algListIndex];
         }
     }
 
     m_Controls.m_teAlgorithmDetails->updateInfo(currentItemInfo);
 
     if (currentItemInfo)
     {
         //update selection provider
         mitk::MAPAlgorithmInfoSelection::Pointer infoSelection = mitk::MAPAlgorithmInfoSelection::Pointer(
             new mitk::MAPAlgorithmInfoSelection(currentItemInfo));
         this->m_SelectionProvider->SetInfoSelection(infoSelection);
     }
 }
 
 
 void QmitkMatchPointBrowser::OnSearchChanged(const QString& text)
 {
     m_filterProxy->setFilterRegExp(text);
     m_filterProxy->setFilterCaseSensitivity(Qt::CaseInsensitive);
 };
 
 void QmitkMatchPointBrowser::CreateQtPartControl(QWidget* parent)
 {
     // create GUI widgets from the Qt Designer's .ui file
     m_Controls.setupUi(parent);
     m_Parent = parent;
 
     m_algModel = new QmitkAlgorithmListModel(parent);
     m_filterProxy = new QSortFilterProxyModel(parent);
 
     //! [Qt Selection Provider registration]
     // create new qt selection provider
     m_SelectionProvider = new mitk::AlgorithmInfoSelectionProvider();
 
     m_filterProxy->setSourceModel(m_algModel);
     m_filterProxy->setDynamicSortFilter(true);
     m_filterProxy->setFilterKeyColumn(-1);
     m_Controls.m_algoTreeView->setModel(m_filterProxy);
     m_Controls.m_algoTreeView->setSelectionMode(QAbstractItemView::SingleSelection);
 
     m_Controls.m_algoTreeView->header()->setStretchLastSection(false);
     m_Controls.m_algoTreeView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
     m_Controls.m_algoTreeView->setColumnHidden(3, true);
 
     this->CreateConnections();
 }
 
 void QmitkMatchPointBrowser::SetSelectionProvider()
 {
     this->GetSite()->SetSelectionProvider(m_SelectionProvider);
 }
 
 void QmitkMatchPointBrowser::SetFocus()
 {
 }
 
 void QmitkMatchPointBrowser::Error(QString msg)
 {
     mitk::StatusBar::GetInstance()->DisplayErrorText(msg.toLatin1());
     MITK_ERROR << msg.toStdString().c_str();
 }
 
 void QmitkMatchPointBrowser::RetrieveAndStorePreferenceValues()
 {
     berry::IBerryPreferences::Pointer prefs = this->RetrievePreferences();
 
     bool loadApplicationDir = prefs->GetBool(
         MatchPointBrowserConstants::LOAD_FROM_APPLICATION_DIR.c_str(), true);
     bool loadHomeDir = prefs->GetBool(MatchPointBrowserConstants::LOAD_FROM_HOME_DIR.c_str(), false);
     bool loadCurrentDir = prefs->GetBool(MatchPointBrowserConstants::LOAD_FROM_CURRENT_DIR.c_str(),
         false);
     bool loadAutoLoadDir = prefs->GetBool(MatchPointBrowserConstants::LOAD_FROM_AUTO_LOAD_DIR.c_str(),
         false);
 
     // Get some default application paths.
     QStringList newPaths;
 
     // Here we can use the preferences to set up the builder,
     if (loadApplicationDir)
     {
         newPaths << QCoreApplication::applicationDirPath();
     }
 
     if (loadHomeDir)
     {
         newPaths << QDir::homePath();
     }
 
     if (loadCurrentDir)
     {
         newPaths << QDir::currentPath();
     }
 
     if (loadAutoLoadDir)
     {
         char* deployedAlgorithmLoadPath = getenv("MAP_MDRA_LOAD_PATH");
 
         if (deployedAlgorithmLoadPath != nullptr)
         {
             // The load path may in fact be a semi-colon or colon separated list of directories, not just one.
             QString paths(deployedAlgorithmLoadPath);
 
 #ifdef Q_OS_WIN32
             QString pathSeparator(";");
 #else
             QString pathSeparator(":");
 #endif
 
             QStringList splitPath = paths.split(pathSeparator, QString::SkipEmptyParts);
 
             foreach(QString path, splitPath)
             {
                 QDir dir = QDir(path);
                 newPaths << dir.absolutePath();
             }
         }
 
     }
 
     // We get additional directory paths from preferences.
     QString pathString = prefs->Get(MatchPointBrowserConstants::MDAR_DIRECTORIES_NODE_NAME.c_str(),
         tr(""));
     QStringList additionalPaths = pathString.split(";", QString::SkipEmptyParts);
     newPaths << additionalPaths;
 
     QString additionalAlgorirthmsString = prefs->Get(
         MatchPointBrowserConstants::MDAR_FILES_NODE_NAME.c_str(), tr(""));
     additionalPaths = additionalAlgorirthmsString.split(";", QString::SkipEmptyParts);
     newPaths << additionalPaths;
 
     m_currentSearchPaths = newPaths;
 }
 
 berry::IBerryPreferences::Pointer QmitkMatchPointBrowser::RetrievePreferences()
 {
     berry::IPreferencesService* prefService
         = berry::Platform::GetPreferencesService();
 
     assert(prefService);
 
     QString id = tr("/") + QString::fromStdString(MatchPointBrowserConstants::VIEW_ID);
     berry::IBerryPreferences::Pointer prefs
         = (prefService->GetSystemPreferences()->Node(id))
         .Cast<berry::IBerryPreferences>();
 
     assert(prefs);
 
     return prefs;
 }