diff --git a/src/pvaproto.h b/src/pvaproto.h
index a096c80..31cabfe 100644
--- a/src/pvaproto.h
+++ b/src/pvaproto.h
@@ -83,7 +83,7 @@ public:
 struct PVXS_API FixedBuf : public Buffer
 {
     typedef Buffer base_type;
-    EPICS_ALWAYS_INLINE bool refill(size_t more) override final { return false; }
+    virtual bool refill(size_t more) override final { return false; }
 
     template<size_t N>
     constexpr FixedBuf(bool be, uint8_t(&buf)[N]) :base_type(be, buf, N) {}
diff --git a/test/testdata.cpp b/test/testdata.cpp
index 699f2b7..4bdae8e 100644
--- a/test/testdata.cpp
+++ b/test/testdata.cpp
@@ -131,7 +131,7 @@ void testDeserialize1()
         testOk1(!!val["timeStamp.nanoseconds"].isMarked());
         testOk1(!!val["alarm.message"].isMarked());
         testEq(val["value"].as<uint32_t>(), 0u);
-        testEq(val["timeStamp.nanoseconds"].as<uint32_t>(), 0xab);
+        testEq(val["timeStamp.nanoseconds"].as<uint32_t>(), 0xabu);
         testEq(val["alarm.message"].as<std::string>(), "hello world");
     }
 
@@ -271,7 +271,7 @@ void testDeserialize2()
         testOk1(!!val["arbitrary.sarr"].isMarked());
         testEq(val["arbitrary.sarr"].as<shared_array<const void>>().size(), 3u*sizeof(Value));
         testEq(val["arbitrary.sarr[0]value"].as<uint32_t>(), 0xdeadbeef);
-        testEq(val["arbitrary.sarr[1]value"].as<uint32_t>(), 0x1badface);
+        testEq(val["arbitrary.sarr[1]value"].as<uint32_t>(), 0x1badfaceu);
         testEq(val["arbitrary.sarr[2]value"].type(), TypeCode::Null);
     }
 
@@ -311,7 +311,7 @@ void testDeserialize2()
         });
         testOk1(!val["value"].isMarked());
         testOk1(!!val["any"].isMarked());
-        testEq(val["any"].as<uint32_t>(), 0x600df00d);
+        testEq(val["any"].as<uint32_t>(), 0x600df00du);
     }
 
     {
@@ -336,7 +336,7 @@ void testDeserialize2()
         testOk1(!val["value"].isMarked());
         testOk1(!!val["anya"].isMarked());
         testEq(val["anya"].as<shared_array<const void>>().size(), 3u*sizeof(Value));
-        testEq(val["anya[0]"].as<uint32_t>(), 0x7b);
+        testEq(val["anya[0]"].as<uint32_t>(), 0x7bu);
         testEq(val["anya[1]q"].as<std::string>(), "theq");
         testEq(val["anya[2]"].type(), TypeCode::Null);
     }