diff --git a/.travis.yml b/.travis.yml
index 9a7db5fd5d5756393f230f2e9346298658783018..292d2cad5881e6e3d1031c3a4ebb958c71e0b2a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,30 +1,46 @@
 language: cpp
+
 compiler:
   - gcc
   - clang
+
 branches:
   only:
     - master
+
 env:
   - CASE=CLI CMAKE_ARGS="-DOGS_BUILD_GUI=OFF -DOGS_BUILD_UTILS=ON"
   - CASE=CLI_PETSC CMAKE_ARGS="-DOGS_BUILD_GUI=OFF -DOGS_BUILD_UTILS=OFF -DOGS_USE_PETSC=ON -DPETSC_DIR=/usr/lib/petscdir/3.4.2/"
   - CASE=GUI CMAKE_ARGS="-DOGS_BUILD_GUI=ON -DVTK_DIR=/home/travis/build/ufz/ogs/VTK-Install/lib/cmake/vtk-6.1/"
+
 before_install:
-  - travis_retry sudo apt-get update; travis_retry sudo apt-get install libeigen3-dev
-  - if [[ "$CC" =~ "gcc" ]]; then travis_retry sudo apt-get install libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-program-options-dev libboost-system-dev; fi
-  - "wget https://launchpad.net/ubuntu/+source/cmake/2.8.8-2ubuntu1/+build/3441442/+files/cmake_2.8.8-2ubuntu1_amd64.deb"
-  - "wget https://launchpad.net/ubuntu/+archive/primary/+files/cmake-data_2.8.8-2ubuntu1_all.deb"
-  - "sudo apt-get remove cmake-data cmake"
-  - "sudo dpkg --install cmake-data_2.8.8-2ubuntu1_all.deb cmake_2.8.8-2ubuntu1_amd64.deb"
+  # -- External package sources --
+  - sudo add-apt-repository --yes ppa:boost-latest
+  - if [[ "$CASE" == "CLI_PETSC" ]]; then sudo add-apt-repository --yes ppa:fenics-packages/fenics-dev; fi
+  - travis_retry sudo apt-get update;
+
+  # -- Install packages --
+  - travis_retry sudo apt-get install libeigen3-dev
+
+  # Boost
+  - travis_retry sudo apt-get install libboost1.55-dev libboost-date-time1.55-dev libboost-filesystem1.55-dev libboost-program-options1.55-dev libboost-system1.55-dev
+
+  # CMake
+  - travis_retry wget https://launchpad.net/ubuntu/+source/cmake/2.8.8-2ubuntu1/+build/3441442/+files/cmake_2.8.8-2ubuntu1_amd64.deb; travis_retry wget https://launchpad.net/ubuntu/+archive/primary/+files/cmake-data_2.8.8-2ubuntu1_all.deb
+  - sudo apt-get remove cmake-data cmake; sudo dpkg --install cmake-data_2.8.8-2ubuntu1_all.deb cmake_2.8.8-2ubuntu1_amd64.deb
+
+  # Qt and VTK
   - if [[ "$CASE" == "GUI" ]]; then travis_retry sudo apt-get install qt4-dev-tools libshp-dev libgeotiff-dev libxt-dev; fi
-  - if [[ "$CASE" == "GUI" ]]; then wget http://www.opengeosys.org/images/dev/vtk-6.1.0.tar.gz; fi
+  - if [[ "$CASE" == "GUI" ]]; then travis_retry wget http://www.opengeosys.org/images/dev/vtk-6.1.0.tar.gz; fi
   - if [[ "$CASE" == "GUI" ]]; then tar -xf vtk-6.1.0.tar.gz; fi
-  - if [[ "$CASE" == "CLI_PETSC" ]]; then sudo add-apt-repository --yes ppa:fenics-packages/fenics-dev; fi
-  - if [[ "$CASE" == "CLI_PETSC" ]]; then sudo apt-get update; fi
-  - if [[ "$CASE" == "CLI_PETSC" ]]; then sudo apt-get install libpetsc3.4.2 libpetsc3.4.2-dev; fi
+
+  # PetSc
+  - if [[ "$CASE" == "CLI_PETSC" ]]; then travis_retry sudo apt-get install libpetsc3.4.2 libpetsc3.4.2-dev; fi
+
 script:
   - "pwd & mkdir build && cd build && cmake $CMAKE_ARGS .. && cmake .. && make"
   - make test
+
 notifications:
   email:
     - lars.bilke@ufz.de
diff --git a/FileIO/XmlIO/Qt/XMLQtInterface.cpp b/FileIO/XmlIO/Qt/XMLQtInterface.cpp
index 51c3aaa1772afff6e6d9ad580532a99485201861..f45588cfd84a9ed7288225811fbd4f6269ee1fc1 100644
--- a/FileIO/XmlIO/Qt/XMLQtInterface.cpp
+++ b/FileIO/XmlIO/Qt/XMLQtInterface.cpp
@@ -42,6 +42,7 @@ int XMLQtInterface::readFile(const QString &fileName)
 		return 0;
 	}
 	_fileData = file.readAll();
+	file.close();
 
 	if (!checkHash())
 		return 0;
@@ -110,7 +111,9 @@ bool XMLQtInterface::checkHash() const
 	QFile file(md5FileName);
 	if (file.open(QIODevice::ReadOnly))
 	{
-		if(file.readAll() == fileHash)
+		QByteArray referenceHash = file.readAll();
+		file.close();
+		if(referenceHash == fileHash)
 			return true;
 		INFO("Hashfile does not match data ... checking file ...");
 	}
diff --git a/FileIO/XmlIO/Qt/XmlLutReader.h b/FileIO/XmlIO/Qt/XmlLutReader.h
index 581412dbcd4d10f824e79288a6e0f7eb44929dd0..bc1ecbb9885ddf3c393c6ba46ad36f9868d6a40d 100644
--- a/FileIO/XmlIO/Qt/XmlLutReader.h
+++ b/FileIO/XmlIO/Qt/XmlLutReader.h
@@ -51,6 +51,7 @@ public:
 		if (docElement.nodeName().compare("ColorMap"))
 		{
 			ERR("XmlLutReader::readFromFile(): Unexpected XML root.");
+			file->close();
 			delete file;
 			return NULL;
 		}
@@ -97,6 +98,7 @@ public:
 
 		lut->SetTableRange(range[0], range[1]);
 
+		file->close();
 		delete file;
 
 		return lut;
diff --git a/Gui/VtkVis/VtkCompositeColormapToImageFilter.cpp b/Gui/VtkVis/VtkCompositeColormapToImageFilter.cpp
index fb0abb34f45b466447ba9523f64f2a2225b5a19f..f9224336eeb8cd2bee095065d6d1c1f429bfa252 100644
--- a/Gui/VtkVis/VtkCompositeColormapToImageFilter.cpp
+++ b/Gui/VtkVis/VtkCompositeColormapToImageFilter.cpp
@@ -52,7 +52,7 @@ void VtkCompositeColormapToImageFilter::init()
 	double range[2];
 	dynamic_cast<vtkImageAlgorithm*>(_inputAlgorithm)->GetOutput()->GetPointData()->GetScalars()->GetRange(range);
 
-	if (!fileName.length()==0)
+	if (fileName.length() > 0)
 	{
 		colormap = FileIO::XmlLutReader::readFromFile(fileName);
 		settings.setValue("lastOpenedLookupTableFileDirectory", fileName);
diff --git a/Gui/mainwindow.cpp b/Gui/mainwindow.cpp
index 8bef3704079063261b0484de3bacf7529735f9cb..33a9dba8cd96cf5aeb3e2ca7be998759ca614644 100644
--- a/Gui/mainwindow.cpp
+++ b/Gui/mainwindow.cpp
@@ -514,7 +514,7 @@ void MainWindow::save()
 void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
 {
 	QFile file(fileName);
-	if (!file.open(QFile::ReadOnly))
+	if (!file.exists())
 	{
 		QMessageBox::warning(this, tr("Application"), tr(
 		                             "Cannot read file %1:\n%2.").arg(fileName).arg(