diff --git a/include/klee/Support/ModuleUtil.h b/include/klee/Support/ModuleUtil.h
index 8d71c4d100..714b6d5237 100644
--- a/include/klee/Support/ModuleUtil.h
+++ b/include/klee/Support/ModuleUtil.h
@@ -41,7 +41,7 @@ linkModules(std::vector<std::unique_ptr<llvm::Module>> &modules,
 
 #if defined(__x86_64__) || defined(__i386__)
 #define addFunctionReplacement(from, to)                                       \
-  {#from "f", #to "f"}, {#from, #to}, { #from "l", #to "l" }
+  {#from "f", #to "f"}, {#from, #to}, { "" #from "l", #to "l" }
 
 #define addIntrinsicReplacement(from, to)                                      \
   {"llvm." #from ".f32", #to "f"}, {"llvm." #from ".f64", #to}, {              \
@@ -49,10 +49,11 @@ linkModules(std::vector<std::unique_ptr<llvm::Module>> &modules,
   }
 
 #else
-#define addFunctionReplacement(from, to) {#from "f", #to "f"}, {#from, #to},
+#define addFunctionReplacement(from, to)                                       \
+  {#from "f", #to "f"}, { "" #from, "" #to }
 
 #define addIntrinsicReplacement(from, to)                                      \
-  {"llvm." #from ".f32", #to "f"}, {"llvm." #from ".f64", #to},
+  {"llvm." #from ".f32", #to "f"}, { "llvm." #from ".f64", #to }
 
 #endif
 
diff --git a/lib/Solver/Z3Solver.cpp b/lib/Solver/Z3Solver.cpp
index b7d964024f..633cda3d64 100644
--- a/lib/Solver/Z3Solver.cpp
+++ b/lib/Solver/Z3Solver.cpp
@@ -588,7 +588,7 @@ SolverImpl::SolverRunStatus Z3SolverImpl::handleSolverResponse(
           assert(Z3_get_ast_kind(builder->ctx, arrayElementOffsetExpr) ==
                      Z3_NUMERAL_AST &&
                  "Evaluated size expression has wrong sort");
-          size_t concretizedOffsetValue = 0;
+          uint64_t concretizedOffsetValue = 0;
           assert(Z3_get_numeral_uint64(builder->ctx, arrayElementOffsetExpr,
                                        &concretizedOffsetValue) &&
                  "Failed to get size");