diff --git a/CMakeLists.txt b/CMakeLists.txt
index d07db7d..3bb7ec4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,13 @@ set(EXECUTABLE_TARGET ${PROJECT_NAME}-executable)
 add_executable(${EXECUTABLE_TARGET} ${SOURCE_FILES})
 set_target_properties(${EXECUTABLE_TARGET} PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
 
+# Add compile definitions
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+	target_compile_definitions(${EXECUTABLE_TARGET} PRIVATE DEBUG)
+else()
+	target_compile_definitions(${EXECUTABLE_TARGET} PRIVATE NDEBUG)
+endif()
+
 # Set link flags to show console window on debug builds and hide it on release builds
 if(MSVC)
 	set_target_properties(${EXECUTABLE_TARGET} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
diff --git a/src/entity/systems/sound-system.cpp b/src/entity/systems/sound-system.cpp
index 8b0f763..b2b62bb 100644
--- a/src/entity/systems/sound-system.cpp
+++ b/src/entity/systems/sound-system.cpp
@@ -53,6 +53,7 @@ SoundSystem::SoundSystem(ComponentManager* componentManager):
 
 	alGenBuffers((ALuint)1, &buffer);
 
+	/*
 	// Load wav file
 	{
 		const char* filename = "data/shutter.wav";
@@ -75,6 +76,7 @@ SoundSystem::SoundSystem(ComponentManager* componentManager):
 
 		alBufferData(buffer, format, sampleData, sampleDataSize, sampleRate);
 	}
+	*/
 
 	alSourcei(source, AL_BUFFER, buffer);
 	//alSourcePlay(source);
diff --git a/src/timestamp.cpp b/src/timestamp.cpp
index f7b4e87..7d0eff2 100644
--- a/src/timestamp.cpp
+++ b/src/timestamp.cpp
@@ -28,12 +28,21 @@ std::string timestamp()
 	auto now = std::chrono::system_clock::now();
 	std::time_t tt = std::chrono::system_clock::to_time_t(now);
 	std::size_t ms = (std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) % 1000).count();
-	struct std::tm timeinfo;
-	localtime_s(&timeinfo, &tt);
-	
-	std::stringstream stream;
-	stream << std::put_time(&timeinfo, "%Y%m%d-%H%M%S-");
-	stream << std::setfill('0') << std::setw(3) << ms;
+
+	#if defined(_WIN32)
+		struct std::tm timeinfo;
+		localtime_s(&timeinfo, &tt);
+		std::stringstream stream;
+		stream << std::put_time(&timeinfo, "%Y%m%d-%H%M%S-");
+		stream << std::setfill('0') << std::setw(3) << ms;
+	#else
+		struct std::tm* timeinfo = localtime(&tt);
+		std::stringstream stream;
+		stream << std::put_time(timeinfo, "%Y%m%d-%H%M%S-");
+		stream << std::setfill('0') << std::setw(3) << ms;
+
+	#endif
 	
 	return stream.str();
-}
\ No newline at end of file
+}
+