diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingDisplayListener.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingDisplayListener.java
index 22e15e17c4..4bcf58003c 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingDisplayListener.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingDisplayListener.java
@@ -24,7 +24,7 @@ public interface ListingDisplayListener {
 	/**
 	 * Callback whenever the set of visible addresses change in the listing.
 	 * @param visibleAddresses the current set of visible addresses in the listing.  If no
-	 * visible addresses are in the listing view, then an empty addressSetView will be return
+	 * visible addresses are in the listing view, then an empty AddressSetView will be passed.
 	 */
 	void visibleAddressesChanged(AddressSetView visibleAddresses);
 }
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingPanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingPanel.java
index 94314e8ef8..04f611593c 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingPanel.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingPanel.java
@@ -476,7 +476,7 @@ public class ListingPanel extends JPanel implements FieldMouseListener, FieldLoc
 		}
 		catch (Throwable t) {
 			Msg.showError(this, fieldPanel, "Error in Display Listener",
-				"Execption encountered in client callback", t);
+				"Execption encountered when notifying listeners of change in display", t);
 		}
 	}
 
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/util/VerticalPixelAddressMapImpl.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/util/VerticalPixelAddressMapImpl.java
index 7d0ea09906..b5ba6cc5f0 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/util/VerticalPixelAddressMapImpl.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/util/VerticalPixelAddressMapImpl.java
@@ -128,7 +128,7 @@ public class VerticalPixelAddressMapImpl implements VerticalPixelAddressMap {
 
 	@Override
 	public AddressSetView getAddressSet() {
-		// If there are no visible layouts (no open data to dispaly or visible height = 0
+		// If there are no visible layouts (no open data to display or listing component height = 0)
 		if (layouts.isEmpty()) {
 			return new AddressSet();
 		}