diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index 786370364e..067e121cc8 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -217,6 +217,14 @@ void Nebula::start()
             {
                 throw runtime_error("Could not create database.");
             }
+
+            oss.str("");
+            oss << "USE " << db_name;
+            rc = db->exec(oss);
+            if ( rc != 0 )
+            {
+                throw runtime_error("Could not open database.");
+            }
         }
 
         NebulaLog::log("ONE",Log::INFO,"Bootstraping OpenNebula database.");
diff --git a/src/sql/MySqlDB.cc b/src/sql/MySqlDB.cc
index 1e9cebd815..f97dab6742 100644
--- a/src/sql/MySqlDB.cc
+++ b/src/sql/MySqlDB.cc
@@ -44,7 +44,7 @@ MySqlDB::MySqlDB(
 
     // Connect to the server
     if (!mysql_real_connect(db, server.c_str(), user.c_str(),
-                            password.c_str(), database.c_str(), port, NULL, 0))
+                            password.c_str(), 0, port, NULL, 0))
     {
         throw runtime_error("Could not open database.");
     }
diff --git a/src/vm_template/test/VMTemplatePoolTest.cc b/src/vm_template/test/VMTemplatePoolTest.cc
index 944c3bda14..8648f410b9 100644
--- a/src/vm_template/test/VMTemplatePoolTest.cc
+++ b/src/vm_template/test/VMTemplatePoolTest.cc
@@ -491,9 +491,9 @@ public:
 
         string result = oss.str();
 
-        result.replace(128, 10, replacement);
-        result.replace(391, 10, replacement);
-        result.replace(656, 10, replacement);
+        result.replace(130, 10, replacement);
+        result.replace(393, 10, replacement);
+        result.replace(658, 10, replacement);
 
 /*
         if( result != xml_dump )
@@ -527,8 +527,8 @@ public:
 
         string result = oss.str();
 
-        result.replace(128, 10, replacement);
-        result.replace(391, 10, replacement);
+        result.replace(130, 10, replacement);
+        result.replace(393, 10, replacement);
 
 /*
         if( result != xml_dump_where )