diff --git a/src/engine/audio/Audio_WavFile.cpp b/src/engine/audio/Audio_WavFile.cpp
index d56e6386..0be92ffb 100644
--- a/src/engine/audio/Audio_WavFile.cpp
+++ b/src/engine/audio/Audio_WavFile.cpp
@@ -275,7 +275,7 @@ bool WavFileWriter::open(const std::tstring& filename, int rate, int channels)
 #else
   mHandle = fopen(StringHelper::makeUtf8(filename).c_str(), "wb");
 #endif
-  if (NULL == mHandle)
+  if (nullptr == mHandle)
   {
     ICELogError(<< "Failed to create .wav file: filename = " << StringHelper::makeUtf8(filename) << " , error = " << errno);
     return false;
@@ -334,11 +334,11 @@ void WavFileWriter::close()
   if (mHandle)
   {
     fclose(mHandle);
-    mHandle = NULL;
+    mHandle = nullptr;
   }
 }
 
-unsigned WavFileWriter::write(const void* buffer, unsigned bytes)
+size_t WavFileWriter::write(const void* buffer, size_t bytes)
 {
   LOCK;
 
@@ -354,11 +354,11 @@ unsigned WavFileWriter::write(const void* buffer, unsigned bytes)
 
   // Write file length
   fseek(mHandle, 4, SEEK_SET);
-  unsigned int fl = mWritten + 36;
+  size_t fl = mWritten + 36;
   fwrite(&fl, sizeof(fl), 1, mHandle);
   
   // Write data length
-  fseek(mHandle, mLengthOffset, SEEK_SET);
+  fseek(mHandle, static_cast<long>(mLengthOffset), SEEK_SET);
   checkWriteResult( fwrite(&mWritten, 4, 1, mHandle) );
 
   return bytes;
@@ -368,7 +368,7 @@ bool WavFileWriter::isOpened()
 {
   LOCK;
 
-  return (mHandle != 0);
+  return (mHandle != nullptr);
 }
 
 std::tstring WavFileWriter::filename()
diff --git a/src/engine/audio/Audio_WavFile.h b/src/engine/audio/Audio_WavFile.h
index 57479d5c..1bdaf465 100644
--- a/src/engine/audio/Audio_WavFile.h
+++ b/src/engine/audio/Audio_WavFile.h
@@ -57,8 +57,8 @@ namespace Audio
     FILE*                   mHandle;        /// Handle of audio file.
     std::tstring            mFileName;      /// Path to requested audio file.
     std::recursive_mutex    mFileMtx;       /// Mutex to protect this instance.
-    int                     mWritten;       /// Amount of written data (in bytes)
-    int                     mLengthOffset;  /// Position of length field.
+    size_t                  mWritten;       /// Amount of written data (in bytes)
+    size_t                  mLengthOffset;  /// Position of length field.
     int                     mRate,
                             mChannels;
 
@@ -71,7 +71,7 @@ namespace Audio
     bool open(const std::tstring& filename, int rate, int channels);
     void close();
     bool isOpened();
-    unsigned write(const void* buffer, unsigned bytes);
+    size_t write(const void* buffer, size_t bytes);
     std::tstring filename();
   };