diff --git a/uppsrc/CtrlLib/FileSel.cpp b/uppsrc/CtrlLib/FileSel.cpp
index b2c963d88..a26f4048b 100644
--- a/uppsrc/CtrlLib/FileSel.cpp
+++ b/uppsrc/CtrlLib/FileSel.cpp
@@ -221,7 +221,8 @@ Image NativePathIcon(const char *path, bool folder)
return GetFileIcon(path, false);
#endif
#ifdef PLATFORM_POSIX
- bool isdrive = folder && ((path == "/media") || (path == "/mnt"));
+ String p = path;
+ bool isdrive = folder && ((p == "/media") || (p == "/mnt"));
FindFile ff(path);
return isdrive ? PosixGetDriveImage(GetFileName(path))
: GetFileIcon(path, GetFileName(path), folder, ff.GetMode() & 0111);
diff --git a/uppsrc/ODBC/ODBC.cpp b/uppsrc/ODBC/ODBC.cpp
index fb6d32fcb..5dad61db0 100644
--- a/uppsrc/ODBC/ODBC.cpp
+++ b/uppsrc/ODBC/ODBC.cpp
@@ -1,523 +1,524 @@
-#include "ODBC.h"
-
-NAMESPACE_UPP
-
-#define LLOG(x)
-
-class ODBCConnection : public SqlConnection
-{
-public:
- ODBCConnection(ODBCSession *session);
- virtual ~ODBCConnection();
-
- void Clear();
-
- virtual void SetParam(int i, const Value& r);
- virtual bool Execute();
- virtual int GetRowsProcessed() const;
- virtual bool Fetch();
- virtual void GetColumn(int i, Ref r) const;
- virtual void Cancel();
- virtual SqlSession& GetSession() const { ASSERT(session); return *session; }
- virtual String GetUser() const { ASSERT(session); return session->user; }
- virtual String ToString() const;
- virtual Value GetInsertedId() const;
-
-private:
- friend class ODBCSession;
-
- ODBCSession *session;
- struct Param {
- int ctype;
- int sqltype;
- String data;
- SQLLEN li;
- };
- Array param, bparam;
- String last_insert_table;
-
- int rowsprocessed;
- Vector< Vector > number;
- Vector< Vector > text;
- Vector< Vector