diff --git a/include/hidl/HidlSupport.h b/include/hidl/HidlSupport.h
index 760c7ab..f9f7f14 100644
--- a/include/hidl/HidlSupport.h
+++ b/include/hidl/HidlSupport.h
@@ -450,7 +450,7 @@
 // Version functions
 struct hidl_version {
 public:
-    constexpr hidl_version(uint16_t major, uint16_t minor) : mMajor(major), mMinor(minor) {};
+    constexpr hidl_version(uint16_t major, uint16_t minor) : mMajor(major), mMinor(minor) {}
 
     bool operator==(const hidl_version& other) {
         return (mMajor == other.get_major() && mMinor == other.get_minor());
@@ -460,7 +460,7 @@
     constexpr uint16_t get_minor() const { return mMinor; }
 
     android::status_t writeToParcel(android::hardware::Parcel& parcel) const {
-        return parcel.writeUint32((uint32_t) mMajor << 16 | mMinor);
+        return parcel.writeUint32(static_cast<uint32_t>(mMajor) << 16 | mMinor);
     }
 
     static hidl_version* readFromParcel(const android::hardware::Parcel& parcel) {
diff --git a/include/hidl/IServiceManager.h b/include/hidl/IServiceManager.h
index 758384c..4013cbf 100644
--- a/include/hidl/IServiceManager.h
+++ b/include/hidl/IServiceManager.h
@@ -55,7 +55,7 @@
 };
 
 struct IHwServiceManager : public IServiceManager, public IInterface {
-    DECLARE_HWBINDER_META_INTERFACE(ServiceManager);
+    DECLARE_HWBINDER_META_INTERFACE(ServiceManager)
 
     enum Call {
         GET_SERVICE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION,