diff --git a/include/decimalfield.h b/include/decimalfield.h
index aa1f842..be26496 100644
--- a/include/decimalfield.h
+++ b/include/decimalfield.h
@@ -108,7 +108,7 @@ public:
     virtual void output(std::ostream &stream) const override
     {
         // output floating point value
-        stream << "decimal(" << _number / pow(10, _places) << ")";
+        stream << "decimal(" << _number / pow(10.0f, _places) << ")";
     }
 
     /**
@@ -138,7 +138,7 @@ public:
      */
     virtual operator double() const override
     {
-        return _number / pow(10, _places);
+        return _number / pow(10.0f, _places);
     }
 
     /**
@@ -149,7 +149,7 @@ public:
      */
     virtual operator float() const override
     {
-        return static_cast<float>(_number / pow(10, _places));
+        return static_cast<float>(_number / pow(10.0f, _places));
     }
 
     /**
diff --git a/src/tcpoutbuffer.h b/src/tcpoutbuffer.h
index 1bbfa4d..6ebd5fa 100644
--- a/src/tcpoutbuffer.h
+++ b/src/tcpoutbuffer.h
@@ -19,6 +19,13 @@
 #include <sys/ioctl.h>
 #include <sys/uio.h>
  
+/**
+ *  FIONREAD on Solaris is defined elsewhere
+ */
+#ifdef __sun
+#include <sys/filio.h>
+#endif
+
 /**
  *  Set up namespace
  */