diff --git a/packages/font-glyphs/src/letter/latin-ext/upper-ae-oe.ptl b/packages/font-glyphs/src/letter/latin-ext/upper-ae-oe.ptl
index ba95d40d7..6e8c752a9 100644
--- a/packages/font-glyphs/src/letter/latin-ext/upper-ae-oe.ptl
+++ b/packages/font-glyphs/src/letter/latin-ext/upper-ae-oe.ptl
@@ -73,7 +73,7 @@ glyph-block Letter-Latin-Upper-AE-OE : begin
 				corner eleft 0
 
 	define [AEAHalfRoundTop df top eleft sw] : glyph-proc
-		include : HBar.t df.leftSB eleft (0.75 * XH * top / CAP) sw
+		include : HBar.t df.leftSB eleft (XH * 0.75 / CAP * top) sw
 		include : dispiro
 			widths.rhs sw
 			flat df.leftSB 0 [heading Upward]
diff --git a/packages/font-glyphs/src/letter/latin/upper-a.ptl b/packages/font-glyphs/src/letter/latin/upper-a.ptl
index a9b278d81..5c861102b 100644
--- a/packages/font-glyphs/src/letter/latin/upper-a.ptl
+++ b/packages/font-glyphs/src/letter/latin/upper-a.ptl
@@ -147,8 +147,9 @@ glyph-block Letter-Latin-Upper-A : begin
 			local df : DivFrame 1
 			include : df.markSet.(mak)
 			set-base-anchor 'trailing' df.rightSB 0
-			if fGrek : include : SetGrekUpperTonos
-				(df.rightSB - df.leftSB) * [if [maskBits slabKind SLAB-TOP] 0 0.2]
+			if fGrek : include : SetGrekUpperTonos : match bodyShape
+				[Just BODY-ROUND-TOP] 0
+				__ : (df.rightSB - df.leftSB) * [if [maskBits slabKind SLAB-TOP] 0 0.2]
 
 			include : AShape.Letter df bodyShape slabKind top Stroke