diff --git a/ChangeLog b/ChangeLog
index 08746cb..5f24604 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2021-08-18 Riccardo Mottola <rm@gnu.org>
+
+	* Modules/Editors/ProjectCenter/PCEditor.m
+	Turn off ligatures, both when setting up the editor as well as when
+	loading a file.
+
+2021-08-18 Riccardo Mottola <rm@gnu.org>
+
+	* PCInfoContronoller.m
+	Center info panel correctly the first time on load.
+
 2021-08-10 Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Framework/PCEditorManager.m: Add method -gotoFile:atLine:
diff --git a/Modules/Editors/ProjectCenter/PCEditor.m b/Modules/Editors/ProjectCenter/PCEditor.m
index add31b3..3732c78 100644
--- a/Modules/Editors/ProjectCenter/PCEditor.m
+++ b/Modules/Editors/ProjectCenter/PCEditor.m
@@ -170,6 +170,7 @@
 				tSelCol, NSForegroundColorAttributeName,
 				nil];
   [ev setSelectedTextAttributes:selAttributes];
+  [ev turnOffLigatures:self];
 
   // Activate undo
   [ev setAllowsUndo: YES];
@@ -321,6 +322,8 @@
   [attributes setObject:font forKey:NSFontAttributeName];
   [attributes setObject:textBackground forKey:NSBackgroundColorAttributeName];
   [attributes setObject:[prefs colorForKey:EditorForegroundColor defaultValue:textColor] forKey:NSForegroundColorAttributeName];
+  [attributes setObject:[NSNumber numberWithInt: 0] // disable ligatures
+		 forKey:NSLigatureAttributeName];
 
   text  = [NSString stringWithContentsOfFile:_path];
   attributedString = [attributedString initWithString:text attributes:attributes];
@@ -763,7 +766,11 @@
 
   // This is temporary
   ft = [NSFont userFixedPitchFontOfSize:0.0];
-  at = [NSDictionary dictionaryWithObject:ft forKey:NSFontAttributeName];
+  at = [NSDictionary dictionaryWithObjectsAndKeys:
+		       ft, NSFontAttributeName,
+			 [NSNumber numberWithInt: 0], NSLigatureAttributeName,
+		     nil];
+
   as = [[NSAttributedString alloc] initWithString:text attributes:at];
 
   [self setIsEdited:NO];
diff --git a/PCInfoController.m b/PCInfoController.m
index 0294bcb..15c15e3 100644
--- a/PCInfoController.m
+++ b/PCInfoController.m
@@ -37,6 +37,13 @@
 
       infoDict = [NSDictionary dictionaryWithContentsOfFile:file];
       RETAIN(infoDict);
+
+      if ([NSBundle loadNibNamed:@"Info" owner:self] == NO)
+	{
+	  return nil;
+	}
+      [versionField setStringValue:[NSString stringWithFormat:@"Version %@", [infoDict objectForKey:@"ApplicationRelease"]]];
+      [infoWindow center];
     }
 
   return self;
@@ -56,29 +63,7 @@
 
 - (void)showInfoWindow:(id)sender
 {
-  if ([NSBundle loadNibNamed:@"Info" owner:self] == NO)
-    {
-//	PCLogError(self, @"error loading Menu NIB file!");
-	return;
-    }
-  [infoWindow center];
   [infoWindow makeKeyAndOrderFront:self];
-  [versionField setStringValue:[NSString stringWithFormat:@"Version %@", [infoDict objectForKey:@"ApplicationRelease"]]];
-		
-/*#if defined(GNUSTEP)
-  if (!infoWindow)
-    {
-      infoWindow = [[GSInfoPanel alloc] initWithDictionary:infoDict];
-    }
-
-  [infoWindow setTitle:@"Info"];
-  [infoWindow center];
-  [infoWindow makeKeyAndOrderFront:self];
-#else
-  NSRunAlertPanel(@"Info",
-		  @"OPENSTEP has no support for GSInfoPanel",
-		  @"OK",nil,nil,nil);
-#endif*/
 }
 
 @end