diff --git a/atdna/main.cpp b/atdna/main.cpp
index 0e30b10..3f3ad92 100644
--- a/atdna/main.cpp
+++ b/atdna/main.cpp
@@ -184,22 +184,22 @@ class ATDNAEmitVisitor : public clang::RecursiveASTVisitor<ATDNAEmitVisitor> {
   static std::string GetOpString(const std::string& fieldName, const std::string& propIdExpr,
                                  const std::string& endianExpr) {
 
-    return "<Op, "s + endianExpr + ">({" + propIdExpr + "}, " + fieldName + ", s)";
+    return "<Op, "s + endianExpr + ">(athena::io::PropId(" + propIdExpr + "), " + fieldName + ", s)";
   }
 
   static std::string GetOpString(const std::string& fieldName, const std::string& propIdExpr) {
 
-    return "<Op>({" + propIdExpr + "}, " + fieldName + ", s)";
+    return "<Op>(athena::io::PropId(" + propIdExpr + "), " + fieldName + ", s)";
   }
 
   static std::string GetVectorOpString(const std::string& fieldName, const std::string& propIdExpr,
                                        const std::string& sizeExpr, const std::string& endianExpr) {
-    return "<Op, "s + endianExpr + ">({" + propIdExpr + "}, " + fieldName + ", " + sizeExpr + ", s)";
+    return "<Op, "s + endianExpr + ">(athena::io::PropId(" + propIdExpr + "), " + fieldName + ", " + sizeExpr + ", s)";
   }
 
   static std::string GetVectorOpString(const std::string& fieldName, const std::string& propIdExpr,
                                        const std::string& sizeExpr) {
-    return "<Op>({" + propIdExpr + "}, " + fieldName + ", " + sizeExpr + ", s)";
+    return "<Op>(athena::io::PropId(" + propIdExpr + "), " + fieldName + ", " + sizeExpr + ", s)";
   }
 
   static void RecurseNestedTypeName(const clang::DeclContext* decl, std::string& templateStmt, std::string& qualType) {
diff --git a/src/athena/Socket.cpp b/src/athena/Socket.cpp
index d4041e5..8057d2a 100644
--- a/src/athena/Socket.cpp
+++ b/src/athena/Socket.cpp
@@ -9,6 +9,7 @@
 #include <netinet/tcp.h>
 #include <sys/socket.h>
 #include <unistd.h>
+#include <fcntl.h>
 #else
 #include <WinSock2.h>
 #include <Ws2tcpip.h>