diff --git a/ispc.cpp b/ispc.cpp
index 6fe3579e..4aad71fa 100644
--- a/ispc.cpp
+++ b/ispc.cpp
@@ -495,6 +495,10 @@ Target::Target(const char *arch, const char *cpu, const char *isa, bool pic) :
             arch = "x86-64";
     }
 
+    // Define arch alias
+    if (std::string(arch) == "x86_64")
+        arch = "x86-64";
+
     bool error = false;
 
     // Make sure the target architecture is a known one; print an error
diff --git a/module.cpp b/module.cpp
index 9ad007a3..3042c3c0 100644
--- a/module.cpp
+++ b/module.cpp
@@ -2869,7 +2869,7 @@ lCreateDispatchFunction(llvm::Module *module, llvm::Function *setISAFunc,
     // ISA and sets __system_best_isa, if it hasn't been set yet.
     llvm::CallInst::Create(setISAFunc, "", bblock);
 
-    // Now we can load the system's ISA enuemrant
+    // Now we can load the system's ISA enumerant
     llvm::Value *systemISA =
         new llvm::LoadInst(systemBestISAPtr, "system_isa", bblock);