diff --git a/Assets/MRTK/Core/Utilities/CameraCache.cs b/Assets/MRTK/Core/Utilities/CameraCache.cs
index a90a573c299..fb3ed239216 100644
--- a/Assets/MRTK/Core/Utilities/CameraCache.cs
+++ b/Assets/MRTK/Core/Utilities/CameraCache.cs
@@ -31,14 +31,14 @@ public static Camera Main
                 }
 
                 // If the cached camera is null, search for main
-                var mainCamera = Camera.main;
+                Camera mainCamera = Camera.main;
 
                 if (mainCamera == null)
                 {
                     Debug.Log("No main camera found. Searching for cameras in the scene.");
 
                     // If no main camera was found, try to determine one.
-                    Camera[] cameras = GameObject.FindObjectsOfType<Camera>();
+                    Camera[] cameras = Object.FindObjectsOfType<Camera>();
                     if (cameras.Length == 0)
                     {
                         Debug.LogWarning("No cameras found. Creating a \"MainCamera\".");
@@ -46,7 +46,7 @@ public static Camera Main
                     }
                     else
                     {
-                        Debug.LogWarning("The Mixed Reality Toolkit was unable to determine a main camera. Please tag the scene's primary camera as \"MainCamera\", in the hierarchy.");
+                        Debug.LogError("The Mixed Reality Toolkit was unable to determine a main camera. Please tag the scene's primary camera as \"MainCamera\", in the hierarchy.");
                     }
                 }
 
diff --git a/Assets/MRTK/Services/CameraSystem/MixedRealityCameraSystem.cs b/Assets/MRTK/Services/CameraSystem/MixedRealityCameraSystem.cs
index 1059b23f977..ae458625cdb 100644
--- a/Assets/MRTK/Services/CameraSystem/MixedRealityCameraSystem.cs
+++ b/Assets/MRTK/Services/CameraSystem/MixedRealityCameraSystem.cs
@@ -45,7 +45,7 @@ public bool IsOpaque
         {
             get
             {
-                currentDisplayType = DisplayType.Opaque;
+                DisplayType currentDisplayType = DisplayType.Opaque;
 
                 IReadOnlyList<IMixedRealityCameraSettingsProvider> dataProviders = GetDataProviders<IMixedRealityCameraSettingsProvider>();
                 if (dataProviders.Count > 0)
@@ -87,7 +87,6 @@ public bool IsOpaque
         /// <inheritdoc/>
         public MixedRealityCameraProfile CameraProfile => ConfigurationProfile as MixedRealityCameraProfile;
 
-        private DisplayType currentDisplayType;
         private bool cameraOpaqueLastFrame = false;
 
         /// <summary>
@@ -140,7 +139,7 @@ public override void Initialize()
             {
                 cameraOpaqueLastFrame = IsOpaque;
 
-                if (IsOpaque)
+                if (cameraOpaqueLastFrame)
                 {
                     ApplySettingsForOpaqueDisplay();
                 }
@@ -212,11 +211,13 @@ public override void Update()
             {
                 base.Update();
 
-                if (IsOpaque != cameraOpaqueLastFrame)
+                bool cameraOpaqueThisFrame = IsOpaque;
+
+                if (cameraOpaqueThisFrame != cameraOpaqueLastFrame)
                 {
-                    cameraOpaqueLastFrame = IsOpaque;
+                    cameraOpaqueLastFrame = cameraOpaqueThisFrame;
 
-                    if (IsOpaque)
+                    if (cameraOpaqueThisFrame)
                     {
                         ApplySettingsForOpaqueDisplay();
                     }