2 files changed, 6 insertions, 6 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/AutoSave.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/AutoSave.cs
index 5d5adc3915..ad93550190 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/AutoSave.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/AutoSave.cs
@@ -111,7 +111,7 @@ namespace MonoDevelop.Ide.Editor
 				if (File.Exists (autosaveFileName))
 					File.Delete (autosaveFileName);
 				content.WriteTextTo (autosaveFileName);
-				Counters.AutoSavedFiles++;
+				Counters.AutoSavedFiles.Inc (1);
 			} catch (Exception e) {
 				LoggingService.LogError ("Error in auto save while creating: " + fileName +". Disableing auto save.", e);
 				DisableAutoSave ();
@@ -158,20 +158,20 @@ namespace MonoDevelop.Ide.Editor
 				}
 			}
 		}
-		static Task finishedTask = Task.FromResult (true);
+
 		internal static Task InformAutoSaveThread (ITextSource content, string fileName, bool isDirty)
 		{
 			if (content == null)
 				throw new ArgumentNullException (nameof (content));
 			if (!autoSaveEnabled || string.IsNullOrEmpty (fileName))
-				return finishedTask;
+				return Task.CompletedTask;
 			if (isDirty) {
 				return Task.Run (() => {
 					CreateAutoSave (fileName, content);
 				});
 			} else {
 				RemoveAutoSaveFile (fileName);
-				return finishedTask;
+				return Task.CompletedTask;
 			}
 		}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs
index cc9805e70f..53745babf6 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs
@@ -333,7 +333,7 @@ namespace MonoDevelop.Ide.Editor
 		private Task UpdateContextOptions (object sender, CodingConventionsChangedEventArgs arg)
 		{
 			if (context == null)
-				return Task.FromResult (false);
+				return Task.CompletedTask;
 
 			bool followCodingConventions = IdeApp.Preferences.Editor.FollowCodingConventions;
 
@@ -368,7 +368,7 @@ namespace MonoDevelop.Ide.Editor
 				}
 			}
 			this.FireChange ();
-			return Task.FromResult (true);
+			return Task.CompletedTask;
 		}
 
 		#region new options