diff --git a/src/layer.cpp b/src/layer.cpp
index 85e669b8c..f0312dbbb 100644
--- a/src/layer.cpp
+++ b/src/layer.cpp
@@ -41,8 +41,9 @@ namespace mapnik
         try
         {
             name_=params_.get("name");
-            volatile datasource_cache* factory=datasource_cache::instance();
-            ds_=factory->create(params_);
+            //volatile datasource_cache* factory=datasource_cache::instance();
+            //ds_=factory->create(params_);
+	    ds_=datasource_cache::instance()->create(params_);
 
         }
         catch (...)
diff --git a/src/render.cpp b/src/render.cpp
index 5fff7cb4c..b326fc65e 100644
--- a/src/render.cpp
+++ b/src/render.cpp
@@ -49,14 +49,14 @@ namespace mapnik
         const datasource_p& ds=l.datasource();
         if (!ds) return;
 	
-	volatile named_style_cache* styles=named_style_cache::instance();
+	//volatile named_style_cache* styles=named_style_cache::instance();
 
 	//get copy
 	std::vector<std::string> const& namedStyles=l.styles();
 	std::vector<std::string>::const_iterator stylesIter=namedStyles.begin();
 	while (stylesIter!=namedStyles.end())
 	{
-	    feature_type_style style=styles->find(*stylesIter++);
+	    feature_type_style style=named_style_cache::instance()->find(*stylesIter++);
 	    
 	    std::set<std::string> names;
 	    attribute_collector<Feature> collector(names);
@@ -105,7 +105,7 @@ namespace mapnik
 		if (fs)
 		{   	    
 		    Feature* feature=0;
-		    while (feature = fs->next())
+		    while ((feature = fs->next()))
 		    {		   
 			bool do_else=true;
 			geometry_ptr& geom=feature->get_geometry();
@@ -153,8 +153,8 @@ namespace mapnik
 		}
 		if (l.isSelectable() && l.selection().size()) //TODO !!!
 		{
-		    volatile style_cache* styles=style_cache::instance();
-		    const Style& style=styles->find(l.selection_style());
+		  //volatile style_cache* styles=style_cache::instance();
+		    const Style& style=style_cache::instance()->find(l.selection_style());
 		
 		    std::vector<ref_ptr<Feature> >& selection=l.selection();