diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7a5d936c978f396b162f6534fa91638e5a48bf2..2349ef9c57bcb68042cdd1cac78cb871188cc6d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 2.6)
   project(systemc-clang)
+  # Use C++ standard version to c++14
+  set(CMAKE_CXX_STANDARD 14)
+  # Always keep it on
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
   option (USE_SAUTO
       "Use suspension-automata library." OFF
diff --git a/scripts/paths.fish b/scripts/paths.fish
index 935454a70322551d5c6a01cba0eb5f58e51d5e6d..5cd1610f246e68cd60614294837cdc0ef4df225b 100644
--- a/scripts/paths.fish
+++ b/scripts/paths.fish
@@ -28,7 +28,7 @@ set -x CXX clang++
 set -x LLVM_CXX_FLAGS (eval $LLVMCONFIG --cxxflags)
 
 # Generate all the flags.
-set -x LLVM_CXX_FLAGS "$LLVM_CXX_FLAGS -fvisibility-inlines-hidden"
+set -x LLVM_CXX_FLAGS "$LLVM_CXX_FLAGS -fvisibility-inlines-hidden -faligned-allocation"
 set -x LLVM_LIBS (eval $LLVMCONFIG --libs)
 set -x LLVM_LD_FLAGS (eval $LLVMCONFIG --ldflags)
 set -x LLVM_LD_FLAGS (echo $LLVM_LD_FLAGS | sed 's/ *$//g')
diff --git a/src/FindTemplateTypes.h b/src/FindTemplateTypes.h
index fcb2bc909ba470acc809814b86cafe75e7f81d12..5e6d8c00d41a3026b1c11b3422b3c7b1e34830fd 100644
--- a/src/FindTemplateTypes.h
+++ b/src/FindTemplateTypes.h
@@ -112,8 +112,8 @@ namespace scpar {
       }
     }
 
-    vector < string > getTemplateArguments() {
-      vector < string > template_arguments;
+    vector<string> getTemplateArguments() {
+      vector<string> template_arguments;
       // type_vector_t::iterator
       //      for ( auto mit = template_types_.begin(); mit != template_types_.end(); ++mit )  {
       for ( auto const &mit: template_types_ ) {