diff --git a/Controller.cpp b/Controller.cpp
index 0ce82f7..6554d56 100644
--- a/Controller.cpp
+++ b/Controller.cpp
@@ -32,7 +32,7 @@ void Controller::handleTransaction()
 {
 	try
 	{
-		if (channels.size() != 0 && chrono::duration_cast<chrono::seconds>(chrono::system_clock::now() - lastMessage) < 5s)
+		if (channels.size() != 0 && chrono::duration_cast<chrono::seconds>(chrono::system_clock::now() - lastMessage) < chrono::seconds(5))
 			toggleACTLED();
 		else
 			enableACTLED(false);
diff --git a/Storage.cpp b/Storage.cpp
index b29ab9b..6c2ea05 100644
--- a/Storage.cpp
+++ b/Storage.cpp
@@ -48,13 +48,13 @@ void Storage::init(const string &dirPrefix)
 			throw runtime_error{ string{ "Invalid syntax of line " } + strLineNum };
 
 		char *endP = nullptr;
-		auto keyH{ static_cast<Storage::KeyHandle>(strtoull(keyHStr.c_str(), &endP, 10)) };
+		Storage::KeyHandle keyH{ static_cast<Storage::KeyHandle>(strtoull(keyHStr.c_str(), &endP, 10)) };
 
 		if (!endP)
 			throw runtime_error{ "Invalid keyhandle format on line " + strLineNum };
 		
 		endP = nullptr;
-		auto keyC{ static_cast<Storage::KeyCount>(strtoull(keyCStr.c_str(), &endP, 10)) };
+		Storage::KeyCount keyC{ static_cast<Storage::KeyCount>(strtoull(keyCStr.c_str(), &endP, 10)) };
 
 		if (!endP)
 			throw runtime_error{ "Invalid key count format on line " + strLineNum };
diff --git a/U2FMessage.hpp b/U2FMessage.hpp
index 4964f75..5a2286d 100644
--- a/U2FMessage.hpp
+++ b/U2FMessage.hpp
@@ -20,6 +20,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <cstdint>
 #include <vector>
 #include <memory>
+#include <cstdint>
 
 struct U2FMessage
 {