diff --git a/src/apps/rdemo/Demo_Environment.h b/src/apps/rdemo/Demo_Environment.h
index 19f73890..890cce6f 100644
--- a/src/apps/rdemo/Demo_Environment.h
+++ b/src/apps/rdemo/Demo_Environment.h
@@ -33,7 +33,7 @@ auto Demo_Environment = [](Application& app)
 
     if (ImGuiLTable::Begin("environment"))
     {
-        float hours = dt.hours();
+        float hours = (float)dt.hours();
         if (ImGuiLTable::SliderFloat("Time of day (UTC)", &hours, 0.0f, 23.999f, "%.1f"))
         {
             dt = DateTime(dt.year(), dt.month(), dt.day(), hours);
diff --git a/src/apps/rdemo/Demo_Label.h b/src/apps/rdemo/Demo_Label.h
index ec0a2b4c..7030e45a 100644
--- a/src/apps/rdemo/Demo_Label.h
+++ b/src/apps/rdemo/Demo_Label.h
@@ -61,12 +61,15 @@ auto Demo_Label = [](Application& app)
         auto& label = app.entities.get<Label>(entity);
         ImGuiLTable::Checkbox("Visible", &label.active);
 
-        char buf[256];
-        strcpy(&buf[0], label.text.c_str());
-        if (ImGuiLTable::InputText("Text", buf, 255))
+        if (label.text.length() <= 255)
         {
-            label.text = std::string(buf);
-            label.dirty();
+            char buf[256];
+            std::copy(label.text.begin(), label.text.end(), buf);
+            if (ImGuiLTable::InputText("Text", &buf[0], 255))
+            {
+                label.text = std::string(buf);
+                label.dirty();
+            }
         }
 
         if (ImGuiLTable::SliderFloat("Point size", &label.style.pointSize, 8.0f, 144.0f, "%.1f"))
diff --git a/src/apps/rdemo/Demo_LineFeatures.h b/src/apps/rdemo/Demo_LineFeatures.h
index 9ecaa4e0..be7272df 100644
--- a/src/apps/rdemo/Demo_LineFeatures.h
+++ b/src/apps/rdemo/Demo_LineFeatures.h
@@ -62,7 +62,7 @@ auto Demo_LineFeatures = [](Application& app)
 
             // apply a style for geometry creation:
             feature_view.styles.line = LineStyle{
-                { 1,1,0.3,1 }, // color
+                { 1,1,0.3f,1 }, // color
                 2.0f,          // width
                 0xffff,        // stipple pattern
                 1,             // stipple factor
diff --git a/src/apps/rdemo/Demo_Mesh.h b/src/apps/rdemo/Demo_Mesh.h
index 1d1cf0eb..a53e8ef6 100644
--- a/src/apps/rdemo/Demo_Mesh.h
+++ b/src/apps/rdemo/Demo_Mesh.h
@@ -41,7 +41,7 @@ auto Demo_Mesh_Absolute = [](Application& app)
         }
 
         // Set a dynamic style that we can change at runtime.
-        mesh.style = { { 1,0.4,0.1,0.75 }, 32.0f, 1e-7f };
+        mesh.style = { { 1.0f, 0.4f, 0.1f, 0.75f }, 32.0f, 1e-7f };
 
         // Turn off depth buffer writes
         mesh.writeDepth = false;
@@ -104,7 +104,7 @@ auto Demo_Mesh_Relative = [](Application& app)
             0,1,5, 0,5,4, 2,3,7, 2,7,6
         };
 
-        vsg::vec4 color{ 1, 0, 1, 0.85 };
+        vsg::vec4 color{ 1, 0, 1, 0.85f };
 
         for (unsigned i = 0; i < 48; )
         {
@@ -113,7 +113,7 @@ auto Demo_Mesh_Relative = [](Application& app)
                 {color, color, color} });
 
             if ((i % 6) == 0)
-                color.r *= 0.8, color.b *= 0.8;
+                color.r *= 0.8f, color.b *= 0.8f;
         }
 
         // Add a transform component so we can position our mesh relative
@@ -184,7 +184,7 @@ auto Demo_Mesh_Multi = [](Application& app)
             0,1,5, 0,5,4, 2,3,7, 2,7,6
         };
 
-        vsg::vec4 color{ 1, 0, 1, 0.85 };
+        vsg::vec4 color{ 1, 0, 1, 0.85f };
 
         for (unsigned i = 0; i < 48; )
         {
@@ -193,7 +193,7 @@ auto Demo_Mesh_Multi = [](Application& app)
                 {color, color, color} });
 
             if ((i % 6) == 0)
-                color.r *= 0.8, color.b *= 0.8;
+                color.r *= 0.8f, color.b *= 0.8f;
         }
 
         // Add a transform component so we can position our mesh relative
diff --git a/src/apps/rdemo/Demo_RTT.h b/src/apps/rdemo/Demo_RTT.h
index d5dbd72a..25ea8834 100644
--- a/src/apps/rdemo/Demo_RTT.h
+++ b/src/apps/rdemo/Demo_RTT.h
@@ -140,8 +140,8 @@ auto Demo_RTT = [](Application& app)
                     {lon, lat + step, alt} };
 
                 for (int i = 0; i < 4; ++i) {
-                    uv[i].s = (v[i].x - lon0) / (lon1 - lon0);
-                    uv[i].t = (v[i].y - lat0) / (lat1 - lat0);
+                    uv[i].s = (float)((v[i].x - lon0) / (lon1 - lon0));
+                    uv[i].t = (float)((v[i].y - lat0) / (lat1 - lat0));
                     xform(v[i], v[i]);
                 }
 
diff --git a/src/apps/rdemo/Demo_Stats.h b/src/apps/rdemo/Demo_Stats.h
index 789206ca..97aac2c6 100644
--- a/src/apps/rdemo/Demo_Stats.h
+++ b/src/apps/rdemo/Demo_Stats.h
@@ -27,9 +27,8 @@ namespace
     Timings update(frame_count);
     Timings record(frame_count);
     int frame_num = 0;
-    char buf[256];
     float get_timings(void* data, int index) {
-        return 0.001 * (float)(*(Timings*)data)[index].count();
+        return 0.001f * (float)(*(Timings*)data)[index].count();
     };
     unsigned long long average(void* data, int count, int start) {
         Timings& t = *(Timings*)(data);
@@ -55,26 +54,28 @@ auto Demo_Stats = [](Application& app)
 
     if (app.debugLayerOn())
     {
-        ImGui::TextColored(ImVec4(1, .3, .3, 1), "Warning: debug validation is ON");
+        ImGui::TextColored(ImVec4(1, .3f, .3f, 1), "Warning: debug validation is ON");
     }
     if (app.instance.runtime().asyncCompile == false)
     {
-        ImGui::TextColored(ImVec4(1, .3, .3, 1), "Warning: async compilation is OFF");
+        ImGui::TextColored(ImVec4(1, .3f, .3f, 1), "Warning: async compilation is OFF");
     }
 
     if (ImGuiLTable::Begin("Timings"))
     {
-        sprintf(buf, "%.2f ms", 0.001f * (float)app.stats.frame.count());
-        ImGuiLTable::PlotLines("Frame", get_timings, &frames, frame_count, f, buf, 0.0f, 17.0f);
+        std::string buf;
 
-        sprintf(buf, u8"%lld \x00B5s", average(&events, over, f));
-        ImGuiLTable::PlotLines("Event", get_timings, &events, frame_count, f, buf, 0.0f, 10.0f);
+        buf = util::format("%.2f ms", 0.001f * (float)app.stats.frame.count());
+        ImGuiLTable::PlotLines("Frame", get_timings, &frames, frame_count, f, buf.c_str(), 0.0f, 17.0f);
 
-        sprintf(buf, u8"%lld \x00B5s", average(&update, over, f));
-        ImGuiLTable::PlotLines("Update", get_timings, &update, frame_count, f, buf, 0.0f, 10.0f);
+        buf = util::format(u8"%lld \x00B5s", average(&events, over, f));
+        ImGuiLTable::PlotLines("Event", get_timings, &events, frame_count, f, buf.c_str(), 0.0f, 10.0f);
 
-        sprintf(buf, u8"%lld \x00B5s", average(&record, over, f));
-        ImGuiLTable::PlotLines("Record", get_timings, &record, frame_count, f, buf, 0.0f, 10.0f);
+        buf = util::format(u8"%lld \x00B5s", average(&update, over, f));
+        ImGuiLTable::PlotLines("Update", get_timings, &update, frame_count, f, buf.c_str(), 0.0f, 10.0f);
+
+        buf = util::format(u8"%lld \x00B5s", average(&record, over, f));
+        ImGuiLTable::PlotLines("Record", get_timings, &record, frame_count, f, buf.c_str(), 0.0f, 10.0f);
 
         ImGuiLTable::End();
     }
@@ -103,8 +104,8 @@ auto Demo_Stats = [](Application& app)
             if (m)
             {
                 std::string name = m->name.empty() ? "default" : m->name;
-                sprintf(buf, "(%d) %d / %d", (int)m->concurrency, (int)m->running, (int)m->pending);
-                ImGuiLTable::Text(name.c_str(), buf);
+                auto buf = util::format("(%d) %d / %d", (int)m->concurrency, (int)m->running, (int)m->pending);
+                ImGuiLTable::Text(name.c_str(), buf.c_str());
             }
         }
         ImGuiLTable::End();
diff --git a/src/apps/rdemo/Demo_Tethering.h b/src/apps/rdemo/Demo_Tethering.h
index 76654cd3..e325a399 100644
--- a/src/apps/rdemo/Demo_Tethering.h
+++ b/src/apps/rdemo/Demo_Tethering.h
@@ -57,7 +57,7 @@ auto Demo_Tethering = [](Application& app)
         auto& mesh = app.entities.emplace<Mesh>(entity);
         vsg::vec3 verts[4] = { { -s, -s, 0 }, {  s, -s, 0 }, {  s,  s, 0 }, { -s,  s, 0 } };
         unsigned indices[6] = { 0,1,2, 0,2,3 };
-        vsg::vec4 color{ 1, 1, 0, 0.55 };
+        vsg::vec4 color{ 1, 1, 0, 0.55f };
         for (unsigned i = 0; i < 6; ) {
             mesh.add({
                 {verts[indices[i++]], verts[indices[i++]], verts[indices[i++]]},
diff --git a/src/apps/rdemo/Demo_Views.h b/src/apps/rdemo/Demo_Views.h
index 42ba7066..592a2865 100644
--- a/src/apps/rdemo/Demo_Views.h
+++ b/src/apps/rdemo/Demo_Views.h
@@ -51,29 +51,31 @@ auto Demo_Views = [](Application& app)
                         bool vp_dirty = false;
                         auto old_vp = view->camera->getViewport();
                         auto vp = view->camera->getViewport();
-                        if (ImGuiLTable::SliderFloat("X", &vp.x, 0, window->traits()->width))
+                        if (ImGuiLTable::SliderFloat("X", &vp.x, 0, (float)window->traits()->width))
                         {
                             vp_dirty = true;
                         }
-                        if (ImGuiLTable::SliderFloat("Y", &vp.y, 0, window->traits()->height))
+                        if (ImGuiLTable::SliderFloat("Y", &vp.y, 0, (float)window->traits()->height))
                         {
                             vp_dirty = true;
                         }
-                        if (ImGuiLTable::SliderFloat("Width", &vp.width, 0, window->traits()->width))
+                        if (ImGuiLTable::SliderFloat("Width", &vp.width, 0, (float)window->traits()->width))
                         {
                             vp_dirty = true;
                         }
-                        if (ImGuiLTable::SliderFloat("Height", &vp.height, 0, window->traits()->height))
+                        if (ImGuiLTable::SliderFloat("Height", &vp.height, 0, (float)window->traits()->height))
                         {
                             vp_dirty = true;
                         }
 
                         if (vp_dirty)
                         {
-                            if (vp.x + vp.width >= window->traits()->width) vp.x = window->traits()->width - vp.width - 1;
-                            if (vp.y + vp.height >= window->traits()->height) vp.y = window->traits()->height - vp.height - 1;
+                            if (vp.x + vp.width >= (float)window->traits()->width) vp.x = (float)window->traits()->width - (float)vp.width - 1;
+                            if (vp.y + vp.height >= (float)window->traits()->height) vp.y = (float)window->traits()->height - (float)vp.height - 1;
                             view->camera->projectionMatrix->changeExtent(VkExtent2D{ (unsigned)old_vp.width, (unsigned)old_vp.height }, VkExtent2D{ (unsigned)vp.width, (unsigned)vp.height });
-                            view->camera->viewportState->set(vp.x, vp.y, vp.width, vp.height);
+                            view->camera->viewportState->set(
+                                (std::uint32_t)vp.x, (std::uint32_t)vp.y,
+                                (std::uint32_t)vp.width, (std::uint32_t)vp.height);
                             app.displayManager->refreshView(view);
                         }
 
diff --git a/src/apps/rdemo/helpers.h b/src/apps/rdemo/helpers.h
index 4c786682..6d799009 100644
--- a/src/apps/rdemo/helpers.h
+++ b/src/apps/rdemo/helpers.h
@@ -58,7 +58,7 @@ namespace ImGuiLTable
         ImGui::TableNextColumn();
         ImGui::SetNextItemWidth(-1);
         std::string s("##" + std::string(label));
-        float temp = *v;
+        float temp = (float)*v;
         bool ok = ImGui::SliderFloat(s.c_str(), &temp, (float)v_min, (float)v_max, format);
         if (ok) *v = (double)temp;
         return ok;
@@ -71,7 +71,7 @@ namespace ImGuiLTable
         ImGui::TableNextColumn();
         ImGui::SetNextItemWidth(-1);
         std::string s("##" + std::string(label));
-        float temp = *v;
+        float temp = (float)*v;
         bool ok = ImGui::SliderFloat(s.c_str(), &temp, (float)v_min, (float)v_max, format, flags);
         if (ok) *v = (double)temp;
         return ok;
diff --git a/src/apps/rdemoqt/rdemoqt.cpp b/src/apps/rdemoqt/rdemoqt.cpp
index 33516bd9..3a4e18ec 100644
--- a/src/apps/rdemoqt/rdemoqt.cpp
+++ b/src/apps/rdemoqt/rdemoqt.cpp
@@ -86,7 +86,7 @@ void newWindow(rocky::Application& app)
     auto dm = app.displayManager;
     app.onNextUpdate([dm]()
         {
-            int i = dm->windowsAndViews.size();
+            auto i = dm->windowsAndViews.size();
 
             // the window:
             auto window = new QWidget();
diff --git a/src/apps/rsimple/rsimple.cpp b/src/apps/rsimple/rsimple.cpp
index 80dde269..f3eca58a 100644
--- a/src/apps/rsimple/rsimple.cpp
+++ b/src/apps/rsimple/rsimple.cpp
@@ -50,7 +50,7 @@ int main(int argc, char** argv)
         }
     }
 
-    mesh.style = { {1, 0.4, 0.1, 0.75}, 32.0f, 1e-7f };
+    mesh.style = { {1, 0.4f, 0.1f, 0.75f}, 32.0f, 1e-7f };
     mesh.writeDepth = true;
 
     return app.run();
diff --git a/src/rocky/Color.cpp b/src/rocky/Color.cpp
index 6c5c264c..46c756ed 100644
--- a/src/rocky/Color.cpp
+++ b/src/rocky/Color.cpp
@@ -261,7 +261,7 @@ Color::Color(const std::string& input, Format format)
             t.size() >= 2 && t[0] == '0' && t[1] == 'x' ? 2 :
             t.size() >= 1 && t[0] == '#' ? 1 :
             0;
-        unsigned len = t.length() - e;
+        unsigned len = (unsigned)t.length() - e;
         if (len == 3)
         {
             // This is a 3 digit hex code, so turn it into a 6 digit hex code
@@ -360,7 +360,7 @@ Color::asHSL() const
     B = glm::fvec4(r, p.y, p.z, p.x);
     glm::fvec4 q = glm::mix(A, B, step(p.x, r));
     float d = q.x - std::min(q.w, q.y);
-    const float e = 1.0e-10;
+    const float e = 1.0e-10f;
     return glm::fvec4(
         fabs(q.z + (q.w - q.y) / (6.0f*d + e)),
         d / (q.x + e),
@@ -424,13 +424,13 @@ Color::createRandomColorRamp(
     std::mt19937 gen(seed >= 0 ? seed : 0);
     std::uniform_int_distribution<> prng(0, 360);
     
-    double hueAngle = (double)prng(gen);// prng.next(360);
+    float hueAngle = (float)prng(gen);// prng.next(360);
     glm::fvec4 hsv(0, 0, 0, 1);
 
     for (unsigned i = 0; i < count; ++i)
     {
-        hueAngle = fmod(hueAngle + 137.50776, 360.0);
-        hsv[0] = hueAngle / 360.0;
+        hueAngle = fmodf(hueAngle + 137.50776f, 360.0f);
+        hsv[0] = hueAngle / 360.0f;
         hsv[1] = satMin + (float)prng(gen)*(satMax - satMin);
         hsv[2] = valMin + (float)prng(gen)*(valMax - valMin);        
         hsv2rgb(hsv);
diff --git a/src/rocky/Common.h b/src/rocky/Common.h
index e69fd8c1..52785d40 100644
--- a/src/rocky/Common.h
+++ b/src/rocky/Common.h
@@ -6,14 +6,8 @@
 #pragma once
 
 #if defined(_MSC_VER)
-#pragma warning( disable : 4244 )
-#pragma warning( disable : 4251 )
-#pragma warning( disable : 4267 )
-#pragma warning( disable : 4275 )
-#pragma warning( disable : 4290 )
-#pragma warning( disable : 4786 )
-#pragma warning( disable : 4305 )
-#pragma warning( disable : 4996 )
+//#pragma warning(disable : 4996) // disable warnings about deprecated functions
+#pragma warning(disable:4244) // disable precision loss warnings (e.g., double to float)
 #endif
 
 #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__)  || defined( __MWERKS__)
@@ -35,6 +29,7 @@
 #include <string>
 #include <memory>
 #include <iostream>
+#include <cstdlib>
 
 namespace ROCKY_NAMESPACE
 {
@@ -111,12 +106,6 @@ namespace ROCKY_NAMESPACE
 
 #define ROCKY_ABOUT(NAME, VER) namespace { struct __about_##NAME { __about_##NAME() { rocky::Instance::about().insert(std::string(#NAME) + " " + VER); } }; __about_##NAME about_##NAME; }
 
-#ifdef _MSC_VER
-// VS ignores
-#pragma warning (disable: 4224)
-#pragma warning (disable: 4180)
-#endif
-
 #define ROCKY_DEPRECATED(A, B) rocky::Log::warn() << #A << " is deprecated; please use " << #B << std::endl
 
 #if defined(_MSC_VER)
diff --git a/src/rocky/DateTime.cpp b/src/rocky/DateTime.cpp
index f20321d5..9b384953 100644
--- a/src/rocky/DateTime.cpp
+++ b/src/rocky/DateTime.cpp
@@ -6,6 +6,10 @@
 #include "DateTime.h"
 #include "Utils.h"
 #include <stdio.h> 
+#include <time.h>
+
+// to get the TIXML_SSCANF macro
+#include "tinyxml/tinyxml.h"
 
 using namespace ROCKY_NAMESPACE;
 
@@ -24,6 +28,19 @@ namespace
     const char* rfc_month[12] = {
         "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
     };
+
+    bool timet_to_tm(const ::time_t& t, ::tm& result)
+    {
+#ifdef _WIN32
+        int err = ::gmtime_s(&result, &t);
+#else
+        int err = ::gmtime_r(&t, &result);
+#endif
+        if (err)
+            ::memset(&result, 0, sizeof(tm));
+
+        return err == 0;
+    }
 }
 
 //------------------------------------------------------------------------
@@ -31,26 +48,20 @@ namespace
 DateTime::DateTime()
 {
     ::time( &_time_t );
-    tm* temp = ::gmtime( &_time_t );
-    if ( temp ) _tm = *temp;
-    else memset( &_tm, 0, sizeof(tm) );
+    timet_to_tm(_time_t, _tm);
 }
 
 DateTime::DateTime(TimeStamp utc)
 {
     _time_t = utc;
-    tm* temp = ::gmtime( &_time_t );
-    if ( temp ) _tm = *temp;
-    else memset( &_tm, 0, sizeof(tm) );
+    timet_to_tm(_time_t, _tm);
 }
 
 DateTime::DateTime(const ::tm& in_tm)
 {
     tm temptm = in_tm;
     _time_t = ::mktime( &temptm ); // assumes in_tm is in local time
-    tm* temp = ::gmtime( &_time_t );
-    if ( temp ) _tm = *temp;
-    else memset( &_tm, 0, sizeof(tm) );
+    timet_to_tm(_time_t, _tm);
     _time_t = this->timegm(&_tm); // back to UTC
 }
 
@@ -70,19 +81,14 @@ DateTime::DateTime(int year, int month, int day, double hour)
 
     // now go to time_t, and back to tm, to populate the rest of the fields.
     _time_t =  this->timegm( &_tm );
-    //_time_t =  ::mktime( &_tm );
-    tm* temp = ::gmtime( &_time_t );
-    if ( temp ) _tm = *temp;
-    else memset( &_tm, 0, sizeof(tm) );
+    timet_to_tm(_time_t, _tm);
 }
 
 DateTime::DateTime(int year, double dayOfYear)
 {
     TimeStamp utc = DateTime(year,1,1,0).asTimeStamp() + (int)((dayOfYear-1.0)*24.0*3600.0);
     _time_t = utc;
-    tm* temp = ::gmtime( &_time_t );
-    if ( temp ) _tm = *temp;
-    else memset( &_tm, 0, sizeof(tm) );    
+    timet_to_tm(_time_t, _tm);
 }
 
 DateTime::DateTime(const std::string& input) :
@@ -99,7 +105,7 @@ DateTime::parse(const std::string& input)
     
     ::memset( &_tm, 0, sizeof(tm) );
 
-    if (sscanf(input.c_str(), "%4d-%2d-%2dT%2d:%2d:%2d", &year, &month, &day, &hour, &min, &sec) == 6)
+    if (TIXML_SSCANF(input.c_str(), "%4d-%2d-%2dT%2d:%2d:%2d", &year, &month, &day, &hour, &min, &sec) == 6)
     {
         _tm.tm_year = year - 1900;
         _tm.tm_mon  = month - 1;
@@ -109,7 +115,7 @@ DateTime::parse(const std::string& input)
         _tm.tm_sec  = sec;
         ok = true;
     }
-    else if (sscanf(input.c_str(), "%4d-%2d-%2d %2d:%2d:%2d", &year, &month, &day, &hour, &min, &sec) == 6)
+    else if (TIXML_SSCANF(input.c_str(), "%4d-%2d-%2d %2d:%2d:%2d", &year, &month, &day, &hour, &min, &sec) == 6)
     {
         _tm.tm_year = year - 1900;
         _tm.tm_mon  = month - 1;
@@ -119,7 +125,7 @@ DateTime::parse(const std::string& input)
         _tm.tm_sec  = sec;
         ok = true;
     }
-    else if (sscanf(input.c_str(), "%4d%2d%2dT%2d%2d%2d", &year, &month, &day, &hour, &min, &sec) == 6)
+    else if (TIXML_SSCANF(input.c_str(), "%4d%2d%2dT%2d%2d%2d", &year, &month, &day, &hour, &min, &sec) == 6)
     {
         _tm.tm_year = year - 1900;
         _tm.tm_mon  = month - 1;
@@ -129,7 +135,7 @@ DateTime::parse(const std::string& input)
         _tm.tm_sec  = sec;
         ok = true;
     }
-    else if (sscanf(input.c_str(), "%4d%2d%2d%2d%2d%2d", &year, &month, &day, &hour, &min, &sec) == 6)
+    else if (TIXML_SSCANF(input.c_str(), "%4d%2d%2d%2d%2d%2d", &year, &month, &day, &hour, &min, &sec) == 6)
     {
         _tm.tm_year = year - 1900;
         _tm.tm_mon  = month - 1;
@@ -144,14 +150,13 @@ DateTime::parse(const std::string& input)
     {
         // now go to time_t, and back to tm, to populate the rest of the fields.
         _time_t =  this->timegm( &_tm );
-        tm* temp = ::gmtime( &_time_t );
-        if ( temp ) _tm = *temp;
+        timet_to_tm(_time_t, _tm);
     }
 }
 
 DateTime::DateTime(const DateTime& rhs) :
-_tm    ( rhs._tm ),
-_time_t( rhs._time_t )
+    _tm(rhs._tm),
+    _time_t(rhs._time_t)
 {
     //nop
 }
diff --git a/src/rocky/ElevationLayer.cpp b/src/rocky/ElevationLayer.cpp
index 2e8aa5a1..e3769269 100644
--- a/src/rocky/ElevationLayer.cpp
+++ b/src/rocky/ElevationLayer.cpp
@@ -317,7 +317,7 @@ ElevationLayer::assembleHeightfield(const TileKey& key, const IOOptions& io) con
             {
                 for (unsigned c = 0; c < width; ++c)
                 {
-                    output->heightAt(c, r) = points[r * width + c].z;
+                    output->heightAt(c, r) = (float)(points[r * width + c].z);
                 }
             }
         }
@@ -541,7 +541,7 @@ ElevationLayerVector::populateHeightfield(
     unsigned numFallbackLayers = 0;
 
     // Check them in reverse order since the highest priority is last.
-    for (i = size()-1; i>=0; --i)
+    for (i = (int)size()-1; i>=0; --i)
     {
         auto layer = (*this)[i];
 
@@ -679,7 +679,7 @@ ElevationLayerVector::populateHeightfield(
                 {
                     auto [resx, resy] = contenders[0].key.getResolutionForTileSize(hf->width());
                     for (unsigned i = 0; i < hf->width()*hf->height(); ++i)
-                        (*resolutions)[i] = resy;
+                        (*resolutions)[i] = (float)resy;
                 }
             }
         }
@@ -790,7 +790,7 @@ ElevationLayerVector::populateHeightfield(
 
                             hf->write(glm::fvec4(elevation), c, r);
 
-                            resolution = actualKey.getResolutionForTileSize(hf->width()).second;
+                            resolution = (float)actualKey.getResolutionForTileSize(hf->width()).second;
                         }
                         else
                         {
@@ -812,7 +812,7 @@ ElevationLayerVector::populateHeightfield(
                     }
                 }
 
-                for (int i = offsets.size() - 1; i >= 0; --i)
+                for (int i = (int)offsets.size() - 1; i >= 0; --i)
                 {
                     if (io.canceled())
                         return false;
diff --git a/src/rocky/Feature.cpp b/src/rocky/Feature.cpp
index aedaf0bd..38bd2d0a 100644
--- a/src/rocky/Feature.cpp
+++ b/src/rocky/Feature.cpp
@@ -76,8 +76,8 @@ namespace
         bool result = false;
         bool is_open = (points.size() > 1 && points.front() != points.back());
         unsigned i = is_open ? 0 : 1;
-        unsigned j = is_open ? points.size() - 1 : 0;
-        for (; i < points.size(); j = i++)
+        unsigned j = is_open ? (unsigned)points.size() - 1 : 0;
+        for (; i < (unsigned)points.size(); j = i++)
         {
             if ((((points[i].y <= y) && (y < points[j].y)) ||
                 ((points[j].y <= y) && (y < points[i].y))) &&
@@ -843,7 +843,7 @@ OGRFeatureSource::open()
                 << "Failed to open layer \"" << layerName << "\" from \"" << _source << "\"");
         }
 
-        _featureCount = OGR_L_GetFeatureCount(_layerHandle, 1);
+        _featureCount = (int)OGR_L_GetFeatureCount(_layerHandle, 1);
 
 #if 0
         // if the user provided a profile, use that:
@@ -897,7 +897,7 @@ OGRFeatureSource::open()
         }
 
         // Get the feature count
-        unsigned featureCount = OGR_L_GetFeatureCount(_layerHandle, 1);
+        //unsigned featureCount = OGR_L_GetFeatureCount(_layerHandle, 1);
 
 #if 0
         // establish the feature schema:
diff --git a/src/rocky/GDAL.cpp b/src/rocky/GDAL.cpp
index ac457c57..f8f7e078 100644
--- a/src/rocky/GDAL.cpp
+++ b/src/rocky/GDAL.cpp
@@ -285,10 +285,10 @@ namespace ROCKY_NAMESPACE
             {
                 if (interp == GPI_RGB)
                 {
-                    color.r = colorEntry->c1;
-                    color.g = colorEntry->c2;
-                    color.b = colorEntry->c3;
-                    color.a = colorEntry->c4;
+                    color.r = (COLOR::value_type)colorEntry->c1;
+                    color.g = (COLOR::value_type)colorEntry->c2;
+                    color.b = (COLOR::value_type)colorEntry->c3;
+                    color.a = (COLOR::value_type)colorEntry->c4;
                 }
                 else if (interp == GPI_CMYK)
                 {
@@ -407,7 +407,7 @@ namespace ROCKY_NAMESPACE
             psExtraArg.dfXSize = nXSize;
             psExtraArg.dfYSize = nYSize;
 
-            CPLErr err = band->RasterIO(eRWFlag, floor(nXOff), floor(nYOff), ceil(nXSize), ceil(nYSize), pData, nBufXSize, nBufYSize, eBufType, nPixelSpace, nLineSpace, &psExtraArg);
+            CPLErr err = band->RasterIO(eRWFlag, (int)nXOff, (int)nYOff, (int)ceil(nXSize), (int)ceil(nYSize), pData, nBufXSize, nBufYSize, eBufType, nPixelSpace, nLineSpace, &psExtraArg);
 
             if (err != CE_None)
             {
@@ -440,7 +440,7 @@ namespace ROCKY_NAMESPACE
 
         Result<shared_ptr<Image>> readImage(
             unsigned char* data,
-            unsigned length,
+            std::size_t length,
             const std::string& name)
         {
             shared_ptr<Image> result;
@@ -513,8 +513,8 @@ namespace ROCKY_NAMESPACE
                         }
                         else if (M)
                         {
-                            auto value_scale = M->GetScale();
-                            auto value_offset = M->GetOffset();
+                            float value_scale = (float)M->GetScale();
+                            float value_offset = (float)M->GetOffset();
 
                             M->RasterIO(GF_Read, 0, 0, width, height, result->data<unsigned char>() + (offset++), width, height, GDT_Float32, 0, 0, nullptr);
 
@@ -928,7 +928,7 @@ GDAL::Driver::isValidValue(float v, GDALRasterBand* band)
 {
     float bandNoData = -32767.0f;
     int success;
-    float value = band->GetNoDataValue(&success);
+    float value = (float)band->GetNoDataValue(&success);
     if (success)
     {
         bandNoData = value;
@@ -971,34 +971,35 @@ GDAL::Driver::getValidElevationValue(float v, float noDataValueFromBand, float r
 float
 GDAL::Driver::getInterpolatedValue(GDALRasterBand* band, double x, double y, bool applyOffset)
 {
-    double r, c;
-    geoToPixel(x, y, c, r);
+    double rd, cd;
+    geoToPixel(x, y, cd, rd);
+    float r = (float)rd, c = (float)cd;
 
     if (applyOffset)
     {
         //Apply half pixel offset
-        r -= 0.5;
-        c -= 0.5;
+        r -= 0.5f;
+        c -= 0.5f;
 
         //Account for the half pixel offset in the geotransform.  If the pixel value is -0.5 we are still technically in the dataset
         //since 0,0 is now the center of the pixel.  So, if are within a half pixel above or a half pixel below the dataset just use
         //the edge values
-        if (c < 0 && c >= -0.5)
+        if (c < 0 && c >= -0.5f)
         {
-            c = 0;
+            c = 0.0f;
         }
         else if (c > _warpedDS->GetRasterXSize() - 1 && c <= _warpedDS->GetRasterXSize() - 0.5)
         {
-            c = _warpedDS->GetRasterXSize() - 1;
+            c = (float)(_warpedDS->GetRasterXSize() - 1);
         }
 
-        if (r < 0 && r >= -0.5)
+        if (r < 0 && r >= -0.5f)
         {
-            r = 0;
+            r = 0.0f;
         }
         else if (r > _warpedDS->GetRasterYSize() - 1 && r <= _warpedDS->GetRasterYSize() - 0.5)
         {
-            r = _warpedDS->GetRasterYSize() - 1;
+            r = (float)(_warpedDS->GetRasterYSize() - 1);
         }
     }
 
@@ -1315,7 +1316,7 @@ GDAL::Driver::createImage(
                 rasterIO(bandGray, GF_Read, src_min_x, src_min_y, src_width, src_height, temp, target_width, target_height, gdalDataType, 0, 0, _layer->interpolation());
 
                 int success = 0;
-                short noDataValueFromBand = bandGray->GetNoDataValue(&success);
+                short noDataValueFromBand = (short)bandGray->GetNoDataValue(&success);
                 if (!success) noDataValueFromBand = (short)-32767;
 
                 for (int src_row = 0, dst_row = tile_offset_top; src_row < target_height; src_row++, dst_row++)
@@ -1339,7 +1340,7 @@ GDAL::Driver::createImage(
                 rasterIO(bandGray, GF_Read, src_min_x, src_min_y, src_width, src_height, temp, target_width, target_height, gdalDataType, 0, 0, _layer->interpolation());
 
                 int success = 0;
-                float noDataValueFromBand = bandGray->GetNoDataValue(&success);
+                float noDataValueFromBand = (float)bandGray->GetNoDataValue(&success);
                 if (!success) noDataValueFromBand = NO_DATA_VALUE;
 
                 for (int src_row = 0, dst_row = tile_offset_top; src_row < target_height; src_row++, dst_row++)
@@ -1495,11 +1496,11 @@ GDAL::Driver::createImage(
                     glm::u8vec4 color;
                     if (!getPalleteIndexColor(bandPalette, p, color))
                     {
-                        color.a = 0.0f;
+                        color.a = 0;
                     }
                     else if (!isValidValue((float)color.r, bandPalette)) // is this applicable for palettized data?
                     {
-                        color.a = 0.0f;
+                        color.a = 0;
                     }
 
                     glm::fvec4 fcolor = glm::fvec4(color) / 255.0f;
diff --git a/src/rocky/GDAL.h b/src/rocky/GDAL.h
index f2c9edb7..dcab957f 100644
--- a/src/rocky/GDAL.h
+++ b/src/rocky/GDAL.h
@@ -140,7 +140,9 @@ namespace ROCKY_NAMESPACE
 
         //! Reads an image from raw data using the specified GDAL driver.
         extern ROCKY_EXPORT Result<shared_ptr<Image>> readImage(
-            unsigned char* data, unsigned len, const std::string& gdal_driver);
+            unsigned char* data,
+            std::size_t len,
+            const std::string& gdal_driver);
 
     } // namespace GDAL
 
diff --git a/src/rocky/GeoHeightfield.cpp b/src/rocky/GeoHeightfield.cpp
index 1c0e15e7..2c6f7f2a 100644
--- a/src/rocky/GeoHeightfield.cpp
+++ b/src/rocky/GeoHeightfield.cpp
@@ -101,7 +101,7 @@ GeoHeightfield::heightAt(double x, double y, const SRSOperation& xform, Image::I
         xform.inverse(temp, temp);
     }
 
-    return temp.z;
+    return (float)temp.z;
 }
 
 float
@@ -129,7 +129,7 @@ GeoHeightfield::heightAt(double x, double y, const SRS& xy_srs, Image::Interpola
     if (temp.z != NO_DATA_VALUE && xform.valid())
         xform.inverse(temp, temp);
 
-    return temp.z;
+    return (float)temp.z;
 }
 
 GeoHeightfield
diff --git a/src/rocky/GeoImage.cpp b/src/rocky/GeoImage.cpp
index 33c6024a..94716ffa 100644
--- a/src/rocky/GeoImage.cpp
+++ b/src/rocky/GeoImage.cpp
@@ -396,8 +396,8 @@ namespace
                         continue;
                     }
 
-                    float px = (src_x - src_extent.xMin()) * xfac;
-                    float py = (src_y - src_extent.yMin()) * yfac;
+                    float px = (float)((src_x - src_extent.xMin()) * xfac);
+                    float py = (float)((src_y - src_extent.yMin()) * yfac);
 
                     int px_i = clamp((int)round(px), 0, (int)image->width() - 1);
                     int py_i = clamp((int)round(py), 0, (int)image->height() - 1);
@@ -798,7 +798,7 @@ GeoImage::read(glm::fvec4& output, const GeoPoint& p) const
         return false;
     }
 
-    _image->read_bilinear(output, u, v);
+    _image->read_bilinear(output, (float)u, (float)v);
 
     return true;
 }
@@ -817,7 +817,7 @@ GeoImage::read(glm::fvec4& out, double x, double y) const
         return false;
     }
 
-    _image->read_bilinear(out, u, v);
+    _image->read_bilinear(out, (float)u, (float)v);
     return true;
 }
 
diff --git a/src/rocky/Heightfield.cpp b/src/rocky/Heightfield.cpp
index 6858c4be..3f3541a4 100644
--- a/src/rocky/Heightfield.cpp
+++ b/src/rocky/Heightfield.cpp
@@ -39,13 +39,6 @@ namespace
     }
 }
 
-//Heightfield::Heightfield(shared_ptr<Image> image)
-//    : _image(image)
-//{
-//    ROCKY_SOFT_ASSERT(image != nullptr);
-//    ROCKY_SOFT_ASSERT(image->pixelFormat() == Image::R32_SFLOAT);
-//}
-
 Heightfield::Heightfield() :
     super(Image::R32_SFLOAT, 0, 0, 1)
 {
@@ -132,13 +125,13 @@ Heightfield::heightAtPixel(
         {
             //OE_NOTICE << "Vertically" << std::endl;
             //Linear interpolate vertically
-            result = ((double)rowMax - r) * llHeight + (r - (double)rowMin) * ulHeight;
+            result = (float)(((double)rowMax - r) * (double)llHeight + (r - (double)rowMin) * (double)ulHeight);
         }
         else if (rowMax == rowMin)
         {
             //OE_NOTICE << "Horizontally" << std::endl;
             //Linear interpolate horizontally
-            result = ((double)colMax - c) * llHeight + (c - (double)colMin) * lrHeight;
+            result = (float)(((double)colMax - c) * (double)llHeight + (c - (double)colMin) * (double)lrHeight);
         }
         else
         {
@@ -146,7 +139,7 @@ Heightfield::heightAtPixel(
             //Bilinear interpolate
             double r1 = ((double)colMax - c) * (double)llHeight + (c - (double)colMin) * (double)lrHeight;
             double r2 = ((double)colMax - c) * (double)ulHeight + (c - (double)colMin) * (double)urHeight;
-            result = ((double)rowMax - r) * (double)r1 + (r - (double)rowMin) * (double)r2;
+            result = (float)(((double)rowMax - r) * (double)r1 + (r - (double)rowMin) * (double)r2);
         }
         break;
     }
@@ -266,8 +259,7 @@ Heightfield::heightAtPixel(
         //Compute the normal
         glm::dvec3 n = glm::cross((v1 - v0), (v2 - v0));
 
-        result = (n.x * (c - v0.x) + n.y*(r - v0.y)) / -n.z + v0.z;
-        //result = (n.x() * (c - v0.x()) + n.y() * (r - v0.y())) / -n.z() + v0.z();
+        result = (float)((n.x * (c - v0.x) + n.y * (r - v0.y)) / -n.z + v0.z);
         break;
     }
     }
diff --git a/src/rocky/Heightfield.h b/src/rocky/Heightfield.h
index 430d1915..92952d0b 100644
--- a/src/rocky/Heightfield.h
+++ b/src/rocky/Heightfield.h
@@ -21,9 +21,7 @@ namespace ROCKY_NAMESPACE
         Heightfield();
 
         //! Construct a heightfield with the given dimensions
-        Heightfield(
-            unsigned cols,
-            unsigned rows);
+        Heightfield(unsigned cols, unsigned rows);
 
         //! Make a heightfield, stealing data from an image.
         explicit Heightfield(Image* rhs);
diff --git a/src/rocky/Horizon.cpp b/src/rocky/Horizon.cpp
index 87384e92..5569c02c 100644
--- a/src/rocky/Horizon.cpp
+++ b/src/rocky/Horizon.cpp
@@ -70,7 +70,7 @@ Horizon::setEye(const glm::dvec3& eye)
     _VHmag2 = _VCmag2 - 1.0;  // viewer->horizon line (scaled)
 
     double VPmag = _VCmag - 1.0 / _VCmag; // viewer->horizon plane dist (scaled)
-    double VHmag = sqrtf(_VHmag2);
+    double VHmag = sqrt(_VHmag2);
 
     _coneCos = VPmag / VHmag; // cos of half-angle of horizon cone
     _coneTan = tan(acos(_coneCos));
diff --git a/src/rocky/IOTypes.cpp b/src/rocky/IOTypes.cpp
index e84f0bb8..a6b25ade 100644
--- a/src/rocky/IOTypes.cpp
+++ b/src/rocky/IOTypes.cpp
@@ -70,7 +70,7 @@ CachePolicy::getMinAcceptTime() const
 {
     return
         minTime.has_value() ? minTime.value() :
-        maxAge.has_value() ? DateTime().asTimeStamp() - maxAge.value() :
+        maxAge.has_value() ? DateTime().asTimeStamp() - (TimeStamp)maxAge.value() :
         0;
 }
 
diff --git a/src/rocky/Image.cpp b/src/rocky/Image.cpp
index e2ef3f5b..ff6cfdd1 100644
--- a/src/rocky/Image.cpp
+++ b/src/rocky/Image.cpp
@@ -13,7 +13,7 @@ namespace
     using ushort = unsigned short;
 
     constexpr float norm_8 = 255.0f;
-    constexpr float denorm_8 = 1.0 / norm_8;
+    constexpr float denorm_8 = 1.0f / norm_8;
 
     template<typename T>
     struct NORM8 {
@@ -30,7 +30,7 @@ namespace
     };
 
     constexpr float norm_16 = 65535.0f;
-    constexpr float denorm_16 = 1.0 / norm_16;
+    constexpr float denorm_16 = 1.0f / norm_16;
 
     template<typename T>
     struct NORM16 {
diff --git a/src/rocky/LayerCollection.cpp b/src/rocky/LayerCollection.cpp
index 15993dc9..143891d1 100644
--- a/src/rocky/LayerCollection.cpp
+++ b/src/rocky/LayerCollection.cpp
@@ -74,11 +74,11 @@ LayerCollection::add(shared_ptr<Layer> layer, const IOOptions& io)
 
     // insert the new layer into the map safely
     Revision new_revision;
-    unsigned index = -1;
+    int index = -1;
     {
         std::unique_lock lock(_map->_mapDataMutex);
         _layers.push_back(layer);
-        index = _layers.size() - 1;
+        index = (int)_layers.size() - 1;
         new_revision = ++_map->_dataModelRevision;
     }
 
@@ -172,7 +172,7 @@ LayerCollection::move(shared_ptr<Layer> layer, unsigned new_index)
     }
 }
 
-unsigned
+std::size_t
 LayerCollection::size() const
 {
     return _layers.size();
@@ -182,7 +182,7 @@ unsigned
 LayerCollection::indexOf(shared_ptr<Layer> layer) const
 {
     if (!layer)
-        return size();
+        return (unsigned)size();
 
     std::shared_lock lock(_map->_mapDataMutex);
     unsigned index = 0;
diff --git a/src/rocky/LayerCollection.h b/src/rocky/LayerCollection.h
index eba3ab9f..49248ba7 100644
--- a/src/rocky/LayerCollection.h
+++ b/src/rocky/LayerCollection.h
@@ -32,7 +32,7 @@ namespace ROCKY_NAMESPACE
         void move(shared_ptr<Layer> layer, unsigned index);
 
         //! Number of layers in the map
-        unsigned size() const;
+        std::size_t size() const;
 
         //! Size == 0
         bool empty() const { return size() == 0; }
diff --git a/src/rocky/MBTiles.cpp b/src/rocky/MBTiles.cpp
index 13c8d35a..661d205a 100644
--- a/src/rocky/MBTiles.cpp
+++ b/src/rocky/MBTiles.cpp
@@ -454,7 +454,7 @@ MBTiles::Driver::write(const TileKey& key, shared_ptr<Image> input, const IOOpti
     sqlite3_bind_int(insert, 3, y);
 
     // bind the data blob:
-    sqlite3_bind_blob(insert, 4, value.c_str(), value.length(), SQLITE_STATIC);
+    sqlite3_bind_blob(insert, 4, value.c_str(), (int)value.length(), SQLITE_STATIC);
 
     // run the sql.
     bool ok = true;
@@ -508,7 +508,7 @@ MBTiles::Driver::getMetaData(const std::string& key, std::string& value)
 
     bool valid = true;
     std::string keyStr = std::string(key);
-    rc = sqlite3_bind_text(select, 1, keyStr.c_str(), keyStr.length(), SQLITE_STATIC);
+    rc = sqlite3_bind_text(select, 1, keyStr.c_str(), (int)keyStr.length(), SQLITE_STATIC);
     if (rc != SQLITE_OK)
     {
         Log()->warn(LC "Failed to bind text: " + query + "; " + sqlite3_errmsg(database));
@@ -542,12 +542,12 @@ MBTiles::Driver::putMetaData(const std::string& key, const std::string& value)
     }
 
     // bind the values:
-    if (SQLITE_OK != sqlite3_bind_text(insert, 1, key.c_str(), key.length(), SQLITE_STATIC))
+    if (SQLITE_OK != sqlite3_bind_text(insert, 1, key.c_str(), (int)key.length(), SQLITE_STATIC))
     {
         Log()->warn(LC "Failed to bind text: " + query + "; " + sqlite3_errmsg(database));
         return false;
     }
-    if (SQLITE_OK != sqlite3_bind_text(insert, 2, value.c_str(), value.length(), SQLITE_STATIC))
+    if (SQLITE_OK != sqlite3_bind_text(insert, 2, value.c_str(), (int)value.length(), SQLITE_STATIC))
     {
         Log()->warn(LC "Failed to bind text: " + query + "; " + sqlite3_errmsg(database));
         return false;
diff --git a/src/rocky/Profile.cpp b/src/rocky/Profile.cpp
index 9555c100..c65991ce 100644
--- a/src/rocky/Profile.cpp
+++ b/src/rocky/Profile.cpp
@@ -262,7 +262,7 @@ Profile::numTiles(unsigned lod) const
     unsigned out_tiles_wide = _shared->_numTilesWideAtLod0;
     unsigned out_tiles_high = _shared->_numTilesHighAtLod0;
 
-    double factor = double(1u << lod);
+    auto factor = 1u << lod;
     out_tiles_wide *= factor;
     out_tiles_high *= factor;
 
diff --git a/src/rocky/Threading.cpp b/src/rocky/Threading.cpp
index fb24226a..95ba6d13 100644
--- a/src/rocky/Threading.cpp
+++ b/src/rocky/Threading.cpp
@@ -18,8 +18,9 @@ void
 rocky::util::setThreadName(const std::string& name)
 {
 #if (defined _WIN32 && defined _WIN32_WINNT_WIN10 && defined _WIN32_WINNT && _WIN32_WINNT >= _WIN32_WINNT_WIN10) || (defined __CYGWIN__)
+    size_t bufsize = 0;
     wchar_t buf[256];
-    mbstowcs(buf, name.c_str(), 256);
+    mbstowcs_s(&bufsize, buf, name.c_str(), 256);
 
     // Look up the address of the SetThreadDescription function rather than using it directly.
     typedef ::HRESULT(WINAPI* SetThreadDescription)(::HANDLE hThread, ::PCWSTR lpThreadDescription);
diff --git a/src/rocky/TileLayer.cpp b/src/rocky/TileLayer.cpp
index 4d216856..e9ca331b 100644
--- a/src/rocky/TileLayer.cpp
+++ b/src/rocky/TileLayer.cpp
@@ -150,8 +150,8 @@ TileLayer::setUpL2Cache(unsigned minSize)
     unsigned l2CacheSize = layerHints().L2CacheSize().getOrUse(minSize);
 
     // See if it was overridden with an env var.
-    char const* l2env = ::getenv("ROCKY_L2_CACHE_SIZE");
-    if (l2env)
+    auto l2env = util::getEnvVar("ROCKY_L2_CACHE_SIZE");
+    if (!l2env.empty())
     {
         l2CacheSize = util::as<int>(std::string(l2env), 0);
         //ROCKY_INFO << LC << "L2 cache size set from environment = " << l2CacheSize << "\n";
@@ -331,7 +331,8 @@ TileLayer::isKeyInVisualRange(const TileKey& key) const
     return true;
 }
 
-unsigned int TileLayer::dataExtentsSize() const
+std::size_t 
+TileLayer::dataExtentsSize() const
 {
     std::shared_lock READ(_dataMutex);
     return _dataExtents.size();
diff --git a/src/rocky/TileLayer.h b/src/rocky/TileLayer.h
index 84355f68..9c6bafed 100644
--- a/src/rocky/TileLayer.h
+++ b/src/rocky/TileLayer.h
@@ -127,7 +127,7 @@ namespace ROCKY_NAMESPACE
         virtual DataExtentList dataExtents() const;
 
         //! Number of data extents on the layer
-        unsigned dataExtentsSize() const;
+        std::size_t dataExtentsSize() const;
 
         //! Extent that is the union of all the extents in getDataExtents().
         const DataExtent& dataExtentsUnion() const;
diff --git a/src/rocky/URI.cpp b/src/rocky/URI.cpp
index 7729c140..b7a014d4 100644
--- a/src/rocky/URI.cpp
+++ b/src/rocky/URI.cpp
@@ -39,7 +39,7 @@ bool URI::supportsHTTPS()
 
 namespace
 {
-    static bool httpDebug = ::getenv("ROCKY_HTTP_DEBUG") != nullptr;
+    static bool httpDebug = !ROCKY_NAMESPACE::util::getEnvVar("ROCKY_HTTP_DEBUG").empty();
 
     bool containsServerAddress(const std::string& input)
     {
diff --git a/src/rocky/Utils.cpp b/src/rocky/Utils.cpp
index 92a93e30..80756c4c 100644
--- a/src/rocky/Utils.cpp
+++ b/src/rocky/Utils.cpp
@@ -219,9 +219,9 @@ rocky::util::toLegalFileName(const std::string& input, bool allowSubdirs, const
 unsigned
 rocky::util::hashString( const std::string& input )
 {
-    const unsigned int m = 0x5bd1e995;
+    const unsigned m = 0x5bd1e995;
     const int r = 24;
-    unsigned int len = input.length();
+    unsigned len = (unsigned)input.length();
     const char* data = input.c_str();
     unsigned int h = m ^ len; // using "m" as the seed.
 
@@ -400,10 +400,10 @@ rocky::util::endsWith( const std::string& ref, const std::string& pattern, bool
     if ( pattern.length() > ref.length() )
         return false;
 
-    unsigned offset = ref.size()-pattern.length();
+    auto offset = ref.size()-pattern.length();
     if ( caseSensitive )
     {
-        for( unsigned i=0; i < pattern.length(); ++i )
+        for( unsigned i=0; i < (unsigned)pattern.length(); ++i )
         {
             if ( ref[i+offset] != pattern[i] )
                 return false;
@@ -411,7 +411,7 @@ rocky::util::endsWith( const std::string& ref, const std::string& pattern, bool
     }
     else
     {
-        for( unsigned i=0; i < pattern.length(); ++i )
+        for( auto i=0; i < pattern.length(); ++i )
         {
             if ( std::toupper(ref[i+offset], loc) != std::toupper(pattern[i],loc) )
                 return false;
@@ -465,6 +465,25 @@ rocky::util::readFromFile(std::string& data, const std::string& filename)
     return true;
 }
 
+std::string
+rocky::util::getEnvVar(const char* name)
+{
+    std::string result;
+    char value[256];
+    size_t value_len = 0;
+    if (::getenv_s(&value_len, value, name) == 0)
+    {
+        result = value;
+    }
+    return result;
+}
+
+bool
+rocky::util::isEnvVarSet(const char* name)
+{
+    return !getEnvVar(name).empty();
+}
+
 #ifdef ROCKY_HAS_ZLIB
 
 // adapted from
@@ -493,7 +512,7 @@ ZLibCompressor::compress(const std::string& src, std::ostream& fout) const
         stategy);
     if (ret != Z_OK) return false;
 
-    strm.avail_in = src.size();
+    strm.avail_in = (uInt)src.size();
     strm.next_in = (Bytef*)(&(*src.begin()));
 
     /* run deflate() on input until output buffer not full, finish
@@ -553,7 +572,7 @@ ZLibCompressor::decompress(std::istream& fin, std::string& target) const
     do
     {
         fin.read((char*)in, CHUNK);
-        strm.avail_in = fin.gcount();
+        strm.avail_in = (uInt)fin.gcount();
         if (strm.avail_in == 0) break;
 
         /* run inflate() on input until output buffer not full */
diff --git a/src/rocky/Utils.h b/src/rocky/Utils.h
index 0cf34d43..3a180266 100644
--- a/src/rocky/Utils.h
+++ b/src/rocky/Utils.h
@@ -10,22 +10,25 @@
 #include <rocky/Status.h>
 #include <rocky/Log.h>
 
-#include <string>
 #include <algorithm>
-#include <vector>
-#include <sstream>
-#include <locale>
+#include <cctype>
+#include <chrono>
+#include <filesystem>
+#include <functional>
 #include <iomanip>
-#include <map>
-#include <unordered_map>
 #include <list>
+#include <locale>
+#include <map>
+#include <memory>
+#include <mutex>
 #include <set>
-#include <filesystem>
-#include <ctype.h>
-#include <functional>
-#include <chrono>
+#include <sstream>
+#include <stdexcept>
+#include <string>
 #include <thread>
-#include <mutex>
+#include <unordered_map>
+#include <vector>
+
 
 class TiXmlDocument;
 
@@ -35,13 +38,31 @@ namespace ROCKY_NAMESPACE
     {
         const std::string EMPTY_STRING = {};
 
-        /** Replaces all the instances of "pattern" with "replacement" in "in_out" */
+        //! Gets the value of an environment variable (safely)
+        extern ROCKY_EXPORT std::string getEnvVar(const char* name);
+
+        //! Whther and environment variable is set at all
+        extern ROCKY_EXPORT bool isEnvVarSet(const char* name);
+
+        //! Replacement for sprintf
+        //! https://stackoverflow.com/a/26221725/4218920
+        template<typename ... Args>
+        std::string format( const std::string& format, Args... args) {
+            int size_s = std::snprintf( nullptr, 0, format.c_str(), args... ) + 1; // Extra space for '\0'
+            if( size_s <= 0 ) { throw std::runtime_error( "Error during formatting." ); }
+            auto size = static_cast<size_t>( size_s );
+            std::unique_ptr<char[]> buf( new char[ size ] );
+            std::snprintf( buf.get(), size, format.c_str(), args ... );
+            return std::string( buf.get(), buf.get() + size - 1 ); // We don't want the '\0' inside
+        }
+
+        //! Replaces all the instances of "pattern" with "replacement" in "in_out"
         extern ROCKY_EXPORT std::string& replace_in_place(
             std::string& in_out,
             const std::string& pattern,
             const std::string& replacement);
 
-        /** Replaces all the instances of "pattern" with "replacement" in "in_out" (case-insensitive) */
+        //! Replaces all the instances of "pattern" with "replacement" in "in_out" (case-insensitive)
         extern ROCKY_EXPORT std::string& replace_in_place_case_insensitive(
             std::string& in_out,
             const std::string& pattern,
diff --git a/src/rocky/sha1.h b/src/rocky/sha1.h
index 94f72115..716b1b25 100644
--- a/src/rocky/sha1.h
+++ b/src/rocky/sha1.h
@@ -199,14 +199,14 @@ namespace ROCKY_NAMESPACE {
             }
 
             sha1& add(const char* text) {
-                return add(text, strlen(text));
+                return add(text, (std::uint32_t)strlen(text));
             }
 
             sha1& finalize() {
                 // hashed text ends with 0x80, some padding 0x00 and the length in bits
                 add_byte_dont_count_bits(0x80);
                 while (i % 64 != 56) add_byte_dont_count_bits(0x00);
-                for (int j = 7; j >= 0; j--) add_byte_dont_count_bits(n_bits >> j * 8);
+                for (int j = 7; j >= 0; j--) add_byte_dont_count_bits((uint8_t)(n_bits >> j * 8U));
 
                 return *this;
             }
diff --git a/src/rocky/vsg/InstanceVSG.cpp b/src/rocky/vsg/InstanceVSG.cpp
index fa9b6637..0593be0d 100644
--- a/src/rocky/vsg/InstanceVSG.cpp
+++ b/src/rocky/vsg/InstanceVSG.cpp
@@ -232,14 +232,14 @@ InstanceVSG::InstanceVSG() :
     runtime.readerWriterOptions->paths.push_back("C:/windows/fonts");
 
     // Load a default font if there is one
-    const char* font_file = getenv("ROCKY_DEFAULT_FONT");
-    if (!font_file)
+    auto font_file = util::getEnvVar("ROCKY_DEFAULT_FONT");
+    if (font_file.empty())
         font_file = "arial.ttf";
 
     runtime.defaultFont = vsg::read_cast<vsg::Font>(font_file, runtime.readerWriterOptions);
     if (!runtime.defaultFont)
     {
-        Log()->warn("Cannot load font \"" + std::string(font_file) + "\"");
+        Log()->warn("Cannot load font \"" + font_file + "\"");
     }
 
     // establish search paths for shaders and data:
diff --git a/src/rocky/vsg/Label.cpp b/src/rocky/vsg/Label.cpp
index 13e9a9b1..2b83f205 100644
--- a/src/rocky/vsg/Label.cpp
+++ b/src/rocky/vsg/Label.cpp
@@ -74,17 +74,17 @@ Label::initializeNode(const ECS::NodeComponent::Params& params)
 
     options = params.readerWriterOptions;
 
-    double size = style.pointSize;
+    float size = style.pointSize;
 
     // Billboard = false because of https://github.com/vsg-dev/VulkanSceneGraph/discussions/985
     // Workaround: use a PixelScaleTransform with unrotate=true
     layout = vsg::StandardLayout::create();
     layout->billboard = false;
-    layout->billboardAutoScaleDistance = 0.0;
-    layout->position = vsg::vec3(0.0, 0.0, 0.0);
-    layout->horizontal = vsg::vec3(size, 0.0, 0.0);
-    layout->vertical = vsg::vec3(0.0, size, 0.0); // layout->billboard ? vsg::vec3(0.0, size, 0.0) : vsg::vec3(0.0, 0.0, size);
-    layout->color = vsg::vec4(1.0, 0.9, 1.0, 1.0);
+    layout->billboardAutoScaleDistance = 0.0f;
+    layout->position = vsg::vec3(0.0f, 0.0f, 0.0f);
+    layout->horizontal = vsg::vec3(size, 0.0f, 0.0f);
+    layout->vertical = vsg::vec3(0.0f, size, 0.0f); // layout->billboard ? vsg::vec3(0.0, size, 0.0) : vsg::vec3(0.0, 0.0, size);
+    layout->color = vsg::vec4(1.0f, 0.9f, 1.0f, 1.0f);
     layout->outlineWidth = style.outlineSize;
     layout->horizontalAlignment = style.horizontalAlignment;
     layout->verticalAlignment = style.verticalAlignment;
diff --git a/src/rocky/vsg/SkyNode.cpp b/src/rocky/vsg/SkyNode.cpp
index e8b97cfd..0c872c60 100644
--- a/src/rocky/vsg/SkyNode.cpp
+++ b/src/rocky/vsg/SkyNode.cpp
@@ -254,7 +254,7 @@ SkyNode::setWorldSRS(const SRS& srs)
         // some ambient light:
         ambient = vsg::AmbientLight::create();
         ambient->name = "Sky Ambient";
-        ambient->color = { 0.013, 0.013, 0.013 };
+        ambient->color = { 0.013f, 0.013f, 0.013f };
         addChild(ambient);
 
         // the sun:
diff --git a/src/rocky/vsg/engine/GeometryPool.cpp b/src/rocky/vsg/engine/GeometryPool.cpp
index f5468ae3..b51f11f1 100644
--- a/src/rocky/vsg/engine/GeometryPool.cpp
+++ b/src/rocky/vsg/engine/GeometryPool.cpp
@@ -16,12 +16,12 @@ GeometryPool::GeometryPool(const SRS& worldSRS) :
     _worldSRS(worldSRS)
 {
     // activate debugging mode
-    if ( getenv("ROCKY_DEBUG_REX_GEOMETRY_POOL") != 0L )
+    if (util::isEnvVarSet("ROCKY_DEBUG_REX_GEOMETRY_POOL"))
     {
         _debug = true;
     }
 
-    if ( ::getenv("ROCKY_REX_NO_POOL") )
+    if (util::isEnvVarSet("ROCKY_NO_GEOMETRY_POOL"))
     {
         _enabled = false;
         Log()->info(LC "Geometry pool disabled (environment)");
diff --git a/src/rocky/vsg/engine/IconSystem.cpp b/src/rocky/vsg/engine/IconSystem.cpp
index 31659c2a..a968f2ed 100644
--- a/src/rocky/vsg/engine/IconSystem.cpp
+++ b/src/rocky/vsg/engine/IconSystem.cpp
@@ -56,13 +56,13 @@ namespace
         shaderSet->addAttributeBinding("in_vertex", "", 0, VK_FORMAT_R32G32B32_SFLOAT, { });
 
         // data uniform buffer (object style)
-        shaderSet->addUniformBinding(
+        shaderSet->addDescriptorBinding(
             "icon", "", 
             BUFFER_SET, BUFFER_BINDING, 
             VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_VERTEX_BIT, {});
 
         // Icon texture image
-        shaderSet->addUniformBinding(
+        shaderSet->addDescriptorBinding(
             "icon_texture", "",
             TEXTURE_SET, TEXTURE_BINDING,
             VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, {});
@@ -107,7 +107,7 @@ IconSystemNode::initialize(Runtime& runtime)
         // activate the arrays we intend to use
         c.config->enableArray("in_vertex", VK_VERTEX_INPUT_RATE_VERTEX, 12);
 
-        c.config->enableUniform("icon");
+        c.config->enableDescriptor("icon");
         c.config->enableTexture("icon_texture");
 
         PipelineUtils::enableViewDependentData(c.config);
diff --git a/src/rocky/vsg/engine/LineSystem.cpp b/src/rocky/vsg/engine/LineSystem.cpp
index 530ef8ac..86a18b4f 100644
--- a/src/rocky/vsg/engine/LineSystem.cpp
+++ b/src/rocky/vsg/engine/LineSystem.cpp
@@ -54,7 +54,7 @@ namespace
         shaderSet->addAttributeBinding("in_color", "", 3, VK_FORMAT_R32G32B32A32_SFLOAT, {});
 
         // line data uniform buffer (width, stipple, etc.)
-        shaderSet->addUniformBinding("line", "", LINE_BUFFER_SET, LINE_BUFFER_BINDING,
+        shaderSet->addDescriptorBinding("line", "", LINE_BUFFER_SET, LINE_BUFFER_BINDING,
             VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_VERTEX_BIT, {});
 
         // We need VSG's view-dependent data:
@@ -101,7 +101,7 @@ LineSystemNode::initialize(Runtime& runtime)
         c.config->enableArray("in_color", VK_VERTEX_INPUT_RATE_VERTEX, 16);
 
         // Uniforms we will need:
-        c.config->enableUniform("line");
+        c.config->enableDescriptor("line");
 
         // always both
         PipelineUtils::enableViewDependentData(c.config);
@@ -221,7 +221,7 @@ LineGeometry::setCount(unsigned value)
 unsigned
 LineGeometry::numVerts() const
 {
-    return _current.size() / 4;
+    return (unsigned)_current.size() / 4;
 }
 
 void
@@ -286,7 +286,7 @@ LineGeometry::compile(vsg::Context& context)
         assignArrays({ vert_array, prev_array, next_array, colors_array });
         assignIndices(indices);
 
-        _drawCommand->indexCount = indices->size();
+        _drawCommand->indexCount = (uint32_t)indices->size();
 
         commands.clear();
         commands.push_back(_drawCommand);
diff --git a/src/rocky/vsg/engine/MeshSystem.cpp b/src/rocky/vsg/engine/MeshSystem.cpp
index f3fb5e63..18c2c2ed 100644
--- a/src/rocky/vsg/engine/MeshSystem.cpp
+++ b/src/rocky/vsg/engine/MeshSystem.cpp
@@ -57,12 +57,12 @@ namespace
         shaderSet->addAttributeBinding("in_depthoffset", "", 4, VK_FORMAT_R32_SFLOAT, {});
 
         // line data uniform buffer (width, stipple, etc.)
-        shaderSet->addUniformBinding("mesh", "USE_MESH_STYLE",
+        shaderSet->addDescriptorBinding("mesh", "USE_MESH_STYLE",
             MESH_UNIFORM_SET, MESH_STYLE_BUFFER_BINDING,
             VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_VERTEX_BIT, {});
 
         // Optional texture
-        shaderSet->addUniformBinding("mesh_texture", "USE_MESH_TEXTURE",
+        shaderSet->addDescriptorBinding("mesh_texture", "USE_MESH_TEXTURE",
             MESH_UNIFORM_SET, MESH_TEXTURE_BINDING,
             VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, {});
 
@@ -112,7 +112,7 @@ MeshSystemNode::initialize(Runtime& runtime)
 
         if (feature_mask & DYNAMIC_STYLE)
         {
-            c.config->enableUniform("mesh");
+            c.config->enableDescriptor("mesh");
             c.config->shaderHints->defines.insert("USE_MESH_STYLE");
         }
 
@@ -243,7 +243,7 @@ MeshGeometry::add(
 {
     for (int v = 0; v < 3; ++v)
     {
-        index_type i = _verts.size();
+        auto i = _verts.size();
         auto key = std::make_tuple(verts[v], colors[v]);
         auto iter1 = _lut.find(key);
         i = iter1 != _lut.end() ? iter1->second : _verts.size();
@@ -254,10 +254,10 @@ MeshGeometry::add(
             _uvs.push_back(uvs[v]);
             _colors.push_back(colors[v]);
             _depthoffsets.push_back(depthoffsets[v]);
-            _lut[key] = i;
+            _lut[key] = (index_type)i;
         }
 
-        _indices.push_back(i);
+        _indices.push_back((index_type)i);
     }
 }
 
@@ -282,7 +282,7 @@ MeshGeometry::compile(vsg::Context& context)
         assignArrays({ vert_array, normal_array, color_array, uv_array, depthoffset_array });
         assignIndices(index_array);
 
-        _drawCommand->indexCount = index_array->size();
+        _drawCommand->indexCount = (uint32_t)index_array->size();
 
         commands.push_back(_drawCommand);
     }
diff --git a/src/rocky/vsg/engine/PipelineState.h b/src/rocky/vsg/engine/PipelineState.h
index f29c6bee..83086f5d 100644
--- a/src/rocky/vsg/engine/PipelineState.h
+++ b/src/rocky/vsg/engine/PipelineState.h
@@ -31,7 +31,7 @@ namespace ROCKY_NAMESPACE
             shaderSet->customDescriptorSetBindings.push_back(
                 vsg::ViewDependentStateBinding::create(VSG_VIEW_DEPENDENT_DATA_SET));
 
-            shaderSet->addUniformBinding(
+            shaderSet->addDescriptorBinding(
                 "vsg_lights", "",
                 VSG_VIEW_DEPENDENT_DATA_SET,
                 VSG_VIEW_DEPENDENT_LIGHTS_BINDING,
@@ -39,7 +39,7 @@ namespace ROCKY_NAMESPACE
                 stageFlags, {});
 
             // VSG viewport state
-            shaderSet->addUniformBinding(
+            shaderSet->addDescriptorBinding(
                 "vsg_viewports", "",
                 VSG_VIEW_DEPENDENT_DATA_SET,
                 VSG_VIEW_DEPENDENT_VIEWPORTS_BINDING,
@@ -49,8 +49,8 @@ namespace ROCKY_NAMESPACE
 
         static void enableViewDependentData(vsg::ref_ptr<vsg::GraphicsPipelineConfigurator> pipelineConfig)
         {
-            pipelineConfig->enableUniform("vsg_lights");
-            pipelineConfig->enableUniform("vsg_viewports");
+            pipelineConfig->enableDescriptor("vsg_lights");
+            pipelineConfig->enableDescriptor("vsg_viewports");
         }
 
         static vsg::ref_ptr<vsg::StateCommand> createViewDependentBindCommand(vsg::ref_ptr<vsg::GraphicsPipelineConfigurator> pipelineConfig)
diff --git a/src/rocky/vsg/engine/TerrainState.cpp b/src/rocky/vsg/engine/TerrainState.cpp
index 1b0a6b06..8c570413 100644
--- a/src/rocky/vsg/engine/TerrainState.cpp
+++ b/src/rocky/vsg/engine/TerrainState.cpp
@@ -182,10 +182,10 @@ TerrainState::createShaderSet() const
     //shaderSet->addAttributeBinding(ATTR_NORMAL_NEIGHBOR, "", 4, VK_FORMAT_R32G32B32A32_SFLOAT, vsg::vec3Array::create(1));
 
     // "binding" (4th param) must match "layout(location=X) uniform" in the shader
-    shaderSet->addUniformBinding(texturedefs.elevation.name, "", 0, texturedefs.elevation.uniform_binding, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, VK_SHADER_STAGE_VERTEX_BIT, {});
-    shaderSet->addUniformBinding(texturedefs.color.name, "", 0, texturedefs.color.uniform_binding, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, {});
-    shaderSet->addUniformBinding(texturedefs.normal.name, "", 0, texturedefs.normal.uniform_binding, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, {});
-    shaderSet->addUniformBinding(TILE_BUFFER_NAME, "", 0, TILE_BUFFER_BINDING, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, {});
+    shaderSet->addDescriptorBinding(texturedefs.elevation.name, "", 0, texturedefs.elevation.uniform_binding, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, VK_SHADER_STAGE_VERTEX_BIT, {});
+    shaderSet->addDescriptorBinding(texturedefs.color.name, "", 0, texturedefs.color.uniform_binding, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, {});
+    shaderSet->addDescriptorBinding(texturedefs.normal.name, "", 0, texturedefs.normal.uniform_binding, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, {});
+    shaderSet->addDescriptorBinding(TILE_BUFFER_NAME, "", 0, TILE_BUFFER_BINDING, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, {});
     
     PipelineUtils::addViewDependentData(shaderSet, VK_SHADER_STAGE_FRAGMENT_BIT);
 
@@ -227,7 +227,7 @@ TerrainState::createPipelineConfig() const
     config->enableTexture(texturedefs.normal.name);
 #endif
 
-    config->enableUniform(TILE_BUFFER_NAME);
+    config->enableDescriptor(TILE_BUFFER_NAME);
 
     PipelineUtils::enableViewDependentData(config);
 
diff --git a/src/rocky/vsg/engine/TerrainTileNode.cpp b/src/rocky/vsg/engine/TerrainTileNode.cpp
index 0e889fca..a31b4c82 100644
--- a/src/rocky/vsg/engine/TerrainTileNode.cpp
+++ b/src/rocky/vsg/engine/TerrainTileNode.cpp
@@ -126,8 +126,8 @@ TerrainTileNode::shouldSubDivide(vsg::State* state) const
     const float TILE_SIZE_PIXELS = 256.0f;
 
     auto& vp = state->_commandBuffer->viewDependentState->viewportData->at(0);
-    float min_screen_height_ratio = (TILE_SIZE_PIXELS + _host->settings().screenSpaceError) / vp[3];
-    float d = state->lodDistance(bound);
+    auto min_screen_height_ratio = (TILE_SIZE_PIXELS + _host->settings().screenSpaceError) / vp[3];
+    auto d = state->lodDistance(bound);
     return (d > 0.0) && (bound.r > (d * min_screen_height_ratio));
 
 #else
diff --git a/src/rocky/vsg/engine/TerrainTilePager.cpp b/src/rocky/vsg/engine/TerrainTilePager.cpp
index 9dc441fb..dff2eb30 100644
--- a/src/rocky/vsg/engine/TerrainTilePager.cpp
+++ b/src/rocky/vsg/engine/TerrainTilePager.cpp
@@ -736,21 +736,21 @@ TerrainTilePager::initializeLODs(const Profile& profile, const TerrainSettings&
         GeoExtent e = key.extent();
         GeoCircle c = e.computeBoundingGeoCircle();
         double range = c.radius() * settings.minTileRangeFactor * 2.0 * (1.0 / 1.405);
-        _lods[lod].visibilityRange = range;
+        _lods[lod].visibilityRange = (float)range;
         _lods[lod].minValidTY = 0;
         _lods[lod].maxValidTY = 0xFFFFFFFF;
     }
 
     double metersPerEquatorialDegree = (profile.srs().ellipsoid().semiMajorAxis() * 2.0 * M_PI) / 360.0;
 
-    double prevPos = 0.0;
+    float prevPos = 0.0;
 
     for (int lod = (int)(numLods - 1); lod >= 0; --lod)
     {
-        double span = _lods[lod].visibilityRange - prevPos;
+        float span = _lods[lod].visibilityRange - prevPos;
 
         _lods[lod].morphEnd = _lods[lod].visibilityRange;
-        _lods[lod].morphStart = prevPos + span * (0.66);
+        _lods[lod].morphStart = prevPos + span * (0.66f);
         prevPos = _lods[lod].morphEnd;
 
         // Calc the maximum valid TY (to avoid over-subdivision at the poles)
diff --git a/src/rocky/vsg/engine/TerrainTilePager.h b/src/rocky/vsg/engine/TerrainTilePager.h
index b09f2af0..156c2639 100644
--- a/src/rocky/vsg/engine/TerrainTilePager.h
+++ b/src/rocky/vsg/engine/TerrainTilePager.h
@@ -32,8 +32,7 @@ namespace ROCKY_NAMESPACE
             // this Tile into an orphan. As an orphan it will expire and eventually
             // be removed anyway, but we need to keep it alive in the meantime...
             vsg::ref_ptr<TerrainTileNode> _tile;
-            void* _trackerToken;
-            TableEntry() : _trackerToken(nullptr) { }
+            void* _trackerToken = nullptr;
         };
 
         using TileTable = std::unordered_map<TileKey, TableEntry>;
@@ -56,7 +55,7 @@ namespace ROCKY_NAMESPACE
             vsg::RecordTraversal&);
 
         //! Number of tiles in the registry.
-        unsigned size() const { return _tiles.size(); }
+        std::size_t size() const { return _tiles.size(); }
 
         //! Empty the registry, releasing all tiles.
         void releaseAll();
@@ -96,8 +95,8 @@ namespace ROCKY_NAMESPACE
 
         //! Visibility info for a single terrain tile LOD
         struct LOD {
-            double visibilityRange;
-            double morphStart, morphEnd;
+            float visibilityRange;
+            float morphStart, morphEnd;
             unsigned minValidTY, maxValidTY;
         };
         unsigned _firstLOD;
diff --git a/src/rocky/vsg/engine/Utils.h b/src/rocky/vsg/engine/Utils.h
index 5c6c9028..3bf6cf4e 100644
--- a/src/rocky/vsg/engine/Utils.h
+++ b/src/rocky/vsg/engine/Utils.h
@@ -62,8 +62,9 @@ namespace ROCKY_NAMESPACE
             a[3][0], a[3][1], a[3][2], a[3][3]);
     }
 
-    inline float distanceTo(const vsg::dvec3& p, vsg::State* state) {
-        return vsg::length(state->modelviewMatrixStack.top() * p);
+    inline float distanceTo(const vsg::dvec3& p, vsg::State* state)
+    {
+        return (float)vsg::length(state->modelviewMatrixStack.top() * p);
     }
 
     namespace util
diff --git a/src/rocky/weemesh.h b/src/rocky/weemesh.h
index cbbfe301..8d56048d 100644
--- a/src/rocky/weemesh.h
+++ b/src/rocky/weemesh.h
@@ -98,7 +98,7 @@ namespace weemesh
         // cast to another vec3 type
         template<class VEC3>
         inline operator VEC3() const {
-            return VEC3(x, y, z);
+            return VEC3((VEC3::value_type)x, (VEC3::value_type)y, (VEC3::value_type)z);
         }
     };
 
@@ -387,8 +387,8 @@ namespace weemesh
             {
                 verts.push_back(input);
                 markers.push_back(marker);
-                _vert_lut[input] = verts.size() - 1;
-                index = verts.size() - 1;
+                _vert_lut[input] = (int)verts.size() - 1;
+                index = (int)verts.size() - 1;
             }
             else
             {
@@ -407,7 +407,7 @@ namespace weemesh
             vert_t::value_type a_max[2] = { xmax, ymax };
             _spatial_index.Search(a_min, a_max, [&](const UID& uid) {
                 output.emplace_back(&triangles[uid]); return true;  });
-            return output.size();
+            return (unsigned)output.size();
         }
 
         template<class T>