diff --git a/swift/lib/ProtocGenSwift/ProtocGenSwift/ProtobufReader.swift b/swift/lib/ProtocGenSwift/ProtocGenSwift/ProtobufReader.swift
index 2f0a39e..81f9710 100644
--- a/swift/lib/ProtocGenSwift/ProtocGenSwift/ProtobufReader.swift
+++ b/swift/lib/ProtocGenSwift/ProtocGenSwift/ProtobufReader.swift
@@ -37,7 +37,9 @@ public class ProtobufReader : Reader {
         if limit != -1 && offset == limit {
             return 0
         }
-        return _readByte(offset++)
+        let readByte = _readByte(offset)
+        offset += 1
+        return readByte
     }
     
     public func readVarInt() -> Int {
@@ -70,7 +72,7 @@ public class ProtobufReader : Reader {
         let numberOfBytes = self.readVarInt()
         let data = NSMutableData(capacity: numberOfBytes)!
         let ptr = UnsafeMutablePointer<UInt8>(data.bytes)
-        for var i = 0; i < numberOfBytes; i++ {
+        for i in 0..<numberOfBytes {
             ptr[i] = self.readByte()
         }
         return data
diff --git a/swift/lib/ProtocGenSwift/ProtocGenSwift/ProtobufWriter.swift b/swift/lib/ProtocGenSwift/ProtocGenSwift/ProtobufWriter.swift
index 2519d36..b3907cc 100644
--- a/swift/lib/ProtocGenSwift/ProtocGenSwift/ProtobufWriter.swift
+++ b/swift/lib/ProtocGenSwift/ProtocGenSwift/ProtobufWriter.swift
@@ -56,7 +56,7 @@ public class ProtobufWriter : Writer {
         let numberOfBytes = v.length
         self.writeVarInt(numberOfBytes)
         let ptr = UnsafePointer<UInt8>(v.bytes)
-        for var i = 0; i < numberOfBytes; i++ {
+        for i in 0..<numberOfBytes {
             self.writeByte(ptr[i])
         }
     }
diff --git a/swift/lib/ProtocGenSwift/ProtocGenSwiftTests/Test.swift b/swift/lib/ProtocGenSwift/ProtocGenSwiftTests/Test.swift
index 7ef502a..a66fc29 100644
--- a/swift/lib/ProtocGenSwift/ProtocGenSwiftTests/Test.swift
+++ b/swift/lib/ProtocGenSwift/ProtocGenSwiftTests/Test.swift
@@ -435,7 +435,7 @@ private func sizeOfVarInt(v: Int) -> Int {
   var x = v
   repeat {
     x = x >> 7
-    n++
+    n += 1
   } while (x > 0)
   return n
 }