diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index e2ae0a15e015c788dbea134ad18f9cc663891464..5374c0b6152b97313d848eba1e9dfa870a274fe8 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -277,23 +277,11 @@ Foam::fileNameList Foam::findEtcFiles
 {
     fileNameList results;
 
-    // Search for user files in ./system
-    // Assumes the application is executed in the case directory
-    fileName searchDir = "system";
-    if (isDir(searchDir))
-    {
-        fileName fullName = searchDir/name;
-        if (isFile(fullName))
-        {
-            results.append(fullName);
-        }
-    }
-
     // Search for user files in
     // * ~/.OpenFOAM/VERSION
     // * ~/.OpenFOAM
     //
-    searchDir = home()/".OpenFOAM";
+    fileName searchDir = home()/".OpenFOAM";
     if (isDir(searchDir))
     {
         fileName fullName = searchDir/FOAMversion/name;
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
index 91bcbb120463861aca5909f395148bf145fc819f..a5378601e75b78ffb40fffb60e6785b38f34d882 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ bool Foam::functionEntry::execute
 
     if (!executedictionaryIstreamMemberFunctionTablePtr_)
     {
-        cerr<<"functionEntry::execute"
+        cerr<< "functionEntry::execute"
             << "(const word&, dictionary&, Istream&)"
             << " not yet initialized, function = "
             << functionName.c_str() << std::endl;
@@ -108,7 +108,7 @@ bool Foam::functionEntry::execute
 
     if (!executeprimitiveEntryIstreamMemberFunctionTablePtr_)
     {
-        cerr<<"functionEntry::execute"
+        cerr<< "functionEntry::execute"
             << "(const word&, const dictionary&, primitiveEntry&, Istream&)"
             << " not yet initialized, function = "
             << functionName.c_str() << std::endl;
@@ -137,4 +137,5 @@ bool Foam::functionEntry::execute
     return mfIter()(parentDict, entry, is);
 }
 
+
 // ************************************************************************* //