diff --git a/src/main/kotlin/com/s13g/sauron/ImageRepository.kt b/src/main/kotlin/com/s13g/sauron/ImageRepository.kt
index 53ff010..722556b 100644
--- a/src/main/kotlin/com/s13g/sauron/ImageRepository.kt
+++ b/src/main/kotlin/com/s13g/sauron/ImageRepository.kt
@@ -87,7 +87,7 @@ class ImageRepository @VisibleForTesting internal constructor(
     // Build list of existing image repo files.
     try {
       mRootDirectory.walkFileTree { file ->
-        if (file.toString().toLowerCase().endsWith(".jpg")) {
+        if (file.toString().lowercase().endsWith(".jpg")) {
           mImageFiles.add(ImageRepoFile(file))
           log.atInfo().log("INIT: Adding existing file: %s", file)
         }
diff --git a/src/main/kotlin/com/s13g/sauron/ImageServer.kt b/src/main/kotlin/com/s13g/sauron/ImageServer.kt
index c71c266..9760b20 100644
--- a/src/main/kotlin/com/s13g/sauron/ImageServer.kt
+++ b/src/main/kotlin/com/s13g/sauron/ImageServer.kt
@@ -135,7 +135,7 @@ class ImageServer {
   private fun serveMotionJpegFrame(outputStream: OutputStream): Long {
     // Make copy so that the response can take as long as it wants without blocking anything.
     val copyForRequest: ByteArray
-    var servedTimestamp = 0L
+    var servedTimestamp : Long
     synchronized(bytesLock) {
       copyForRequest = currentImageBytes.copyOf()
       servedTimestamp = lastModified
diff --git a/src/main/kotlin/com/s13g/sauron/taker/PictureTakerTestingImpl.kt b/src/main/kotlin/com/s13g/sauron/taker/PictureTakerTestingImpl.kt
index 1a93940..5e9dc94 100644
--- a/src/main/kotlin/com/s13g/sauron/taker/PictureTakerTestingImpl.kt
+++ b/src/main/kotlin/com/s13g/sauron/taker/PictureTakerTestingImpl.kt
@@ -21,7 +21,7 @@ fun createTestPictureTakerFrom(directory: File): PictureTaker {
     throw RuntimeException("Directory does not exist: " + directory.absolutePath)
   }
   val jpegFiles = directory.listFiles { _: File?, name: String ->
-    name.toLowerCase().endsWith(".jpg")
+    name.lowercase().endsWith(".jpg")
   }
   if (jpegFiles == null || jpegFiles.isEmpty()) {
     throw RuntimeException("No JPEG files in directory " + directory.absolutePath)