diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 4ed59c755f..899fb6105d 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.Capabilities
         /// </summary>
         public void RegisterHandlers()
         {
-            Console.WriteLine("registering CAPS handlers");
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("CAPS","Registering CAPS handlers");
             string capsBase = "/CAPS/" + m_capsObjectPath;
             try
             {
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index f4648dfa5b..77b928394c 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -199,8 +199,7 @@ namespace OpenSim.Framework.UserManagement
         public virtual bool AuthenticateUser(UserProfileData profile, string password)
         {
             
-            MainLog.Instance.Verbose(
-                "Authenticating " + profile.username + " " + profile.surname);
+            MainLog.Instance.Verbose("LOGIN","Authenticating " + profile.username + " " + profile.surname);
 
             password = password.Remove(0, 3); //remove $1$
 
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
index c7b76595bf..4817b09dc0 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
@@ -207,7 +207,7 @@ namespace OpenSim.Framework.Data.SQLite
                         fillUserAgentRow(row, user.currentAgent);
                     }
                 }
-                MainLog.Instance.Verbose("Syncing user database: " + ds.Tables["users"].Rows.Count + " users stored");
+                MainLog.Instance.Verbose("SQLITE", "Syncing user database: " + ds.Tables["users"].Rows.Count + " users stored");
                 // save changes off to disk
                 da.Update(ds, "users");
             }
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 643b158df1..d5e55a703e 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.ClientStack
 
         protected virtual bool Logout(IClientAPI client, Packet packet)
         {
-            MainLog.Instance.Verbose("OpenSimClient.cs:ProcessInPacket() - Got a logout request");
+            MainLog.Instance.Verbose("CLIENT", "Got a logout request");
 
             if( OnLogout != null )
             {
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index cf4072cb52..7a55c35a18 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Region.ClientStack
             // m_inventoryCache = inventoryCache;
             m_authenticateSessionsHandler = authenSessions;
 
-            MainLog.Instance.Verbose("OpenSimClient.cs - Started up new client thread to handle incoming request");
+            MainLog.Instance.Verbose("CLIENT","Started up new client thread to handle incoming request");
             cirpack = initialcirpack;
             userEP = remoteEP;
 
@@ -224,7 +224,7 @@ namespace OpenSim.Region.ClientStack
 
         protected virtual void ClientLoop()
         {
-            MainLog.Instance.Verbose("OpenSimClient.cs:ClientLoop() - Entered loop");
+            MainLog.Instance.Verbose("CLIENT", "Entered loop");
             while (true)
             {
                 QueItem nextPacket = PacketQueue.Dequeue();
@@ -282,7 +282,7 @@ namespace OpenSim.Region.ClientStack
             clientPingTimer.Elapsed += new ElapsedEventHandler(CheckClientConnectivity);
             clientPingTimer.Enabled = true;
 
-            MainLog.Instance.Verbose("OpenSimClient.cs:InitNewClient() - Adding viewer agent to scene");
+            MainLog.Instance.Verbose("CLIENT","Adding viewer agent to scene");
             this.m_scene.AddNewClient(this, true);
         }
 
@@ -293,12 +293,12 @@ namespace OpenSim.Region.ClientStack
             if (!sessionInfo.Authorised)
             {
                 //session/circuit not authorised
-                MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
+                MainLog.Instance.Notice("CLIENT", "New user request denied to " + userEP.ToString());
                 ClientThread.Abort();
             }
             else
             {
-                MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
+                MainLog.Instance.Notice("CLIENT", "Got authenticated connection from " + userEP.ToString());
                 //session is authorised
                 m_agentId = cirpack.CircuitCode.ID;
                 this.m_sessionId = cirpack.CircuitCode.SessionID;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index ee476782e8..84eb503a74 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -859,14 +859,14 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (child)
             {
-                MainLog.Instance.Verbose(RegionInfo.RegionName + ": Creating new child agent.");
+                MainLog.Instance.Verbose("SCENE", RegionInfo.RegionName + ": Creating new child agent.");
             }
             else
             {
                 newAvatar.OnSignificantClientMovement += m_LandManager.handleSignificantClientMovement;
 
-                MainLog.Instance.Verbose(RegionInfo.RegionName + ": Creating new root agent.");
-                MainLog.Instance.Verbose(RegionInfo.RegionName + ": Adding Physical agent.");
+                MainLog.Instance.Verbose("SCENE", RegionInfo.RegionName + ": Creating new root agent.");
+                MainLog.Instance.Verbose("SCENE", RegionInfo.RegionName + ": Adding Physical agent.");
 
                 newAvatar.AddToPhysicalScene();
             }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 2f5829a6e6..99f78c98c7 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -234,7 +234,6 @@ namespace OpenSim.Region.Environment.Scenes
 
             m_regionInfo = reginfo;
             m_regionHandle = reginfo.RegionHandle;
-            MainLog.Instance.Verbose("Avatar.cs ");
             m_controllingClient = client;
             m_firstname = m_controllingClient.FirstName;
             m_lastname = m_controllingClient.LastName;
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
index e2614ee462..95772dfb0d 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
@@ -98,11 +98,19 @@ namespace OpenSim.DataStore.MonoSqlite
                 try
                 {
                     shapeDa.Fill(ds.Tables["primshapes"]);
+                }
+                catch (Exception)
+                {
+                    MainLog.Instance.Verbose("DATASTORE", "Caught fill error on primshapes table");
+                }
+
+                try
+                {
                     terrainDa.Fill(ds.Tables["terrain"]);
                 }
                 catch (Exception)
                 {
-                    MainLog.Instance.Verbose("DATASTORE", "Caught fill error on primshapes or terrain table");
+                    MainLog.Instance.Verbose("DATASTORE", "Caught fill error on terrain table");
                 }
                 return;
             }