diff --git a/packages/font-glyphs/src/letter/shared.ptl b/packages/font-glyphs/src/letter/shared.ptl
index 30fb093728..5caee79f0c 100644
--- a/packages/font-glyphs/src/letter/shared.ptl
+++ b/packages/font-glyphs/src/letter/shared.ptl
@@ -28,7 +28,7 @@ glyph-block Letter-Shared : begin
 			foreach part [items-of : glyphParts.slice 1] : if part : include part
 
 			if (!gr) : begin
-				if (gns.length === 2 && [gns.1.endsWith 'tittleAbove'])
+				if (gns.length === 2 && ([gns.1.endsWith 'tittleAbove'] || [gns.1.endsWith 'dotAbove']))
 				: then : Dotless.set currentGlyph gns.0
 				: else : CvDecompose.set currentGlyph gns
 
diff --git a/packages/font-otl/src/gsub-locl.ptl b/packages/font-otl/src/gsub-locl.ptl
index cd33f63851..0037ae0e67 100644
--- a/packages/font-otl/src/gsub-locl.ptl
+++ b/packages/font-otl/src/gsub-locl.ptl
@@ -21,13 +21,19 @@ export : define [buildLOCL gsub para glyphStore] : begin
 	define latnMOL  : gsub.copyLanguage 'latn_MOL ' 'latn_DFLT'
 	define latnTRK  : gsub.copyLanguage 'latn_TRK ' 'latn_DFLT'
 	define latnAZE  : gsub.copyLanguage 'latn_AZE ' 'latn_DFLT'
+	define latnCRT  : gsub.copyLanguage 'latn_CRT ' 'latn_DFLT'
 	define latnGAG  : gsub.copyLanguage 'latn_GAG ' 'latn_DFLT'
+	define latnJCT  : gsub.copyLanguage 'latn_JCT ' 'latn_DFLT'
 	define latnKAZ  : gsub.copyLanguage 'latn_KAZ ' 'latn_DFLT'
+	define latnKJJ  : gsub.copyLanguage 'latn_KJJ ' 'latn_DFLT'
+	define latnKMZ  : gsub.copyLanguage 'latn_KMZ ' 'latn_DFLT'
 	define latnTAT  : gsub.copyLanguage 'latn_TAT ' 'latn_DFLT'
-	define latnCRT  : gsub.copyLanguage 'latn_CRT ' 'latn_DFLT'
+	define latnTLY  : gsub.copyLanguage 'latn_TLY ' 'latn_DFLT'
+	define latnUDI  : gsub.copyLanguage 'latn_UDI ' 'latn_DFLT'
+	define latnZZA  : gsub.copyLanguage 'latn_ZZA ' 'latn_DFLT'
 	define latnVIT  : gsub.copyLanguage 'latn_VIT ' 'latn_DFLT'
-	define grekIPPH : gsub.copyLanguage 'grek_IPPH ' 'grek_DFLT'
-	define grekAPPH : gsub.copyLanguage 'grek_APPH ' 'grek_DFLT'
+	define grekIPPH : gsub.copyLanguage 'grek_IPPH' 'grek_DFLT'
+	define grekAPPH : gsub.copyLanguage 'grek_APPH' 'grek_DFLT'
 
 	# SRB
 	define loclSRB : gsub.createFeature 'locl'
@@ -70,10 +76,16 @@ export : define [buildLOCL gsub para glyphStore] : begin
 	define loclTRK : gsub.createFeature 'locl'
 	latnTRK.addFeature loclTRK
 	latnAZE.addFeature loclTRK
+	latnCRT.addFeature loclTRK
 	latnGAG.addFeature loclTRK
+	latnJCT.addFeature loclTRK
 	latnKAZ.addFeature loclTRK
+	latnKJJ.addFeature loclTRK
+	latnKMZ.addFeature loclTRK
 	latnTAT.addFeature loclTRK
-	latnCRT.addFeature loclTRK
+	latnTLY.addFeature loclTRK
+	latnUDI.addFeature loclTRK
+	latnZZA.addFeature loclTRK
 	loclTRK.addLookup : createGsubLookupFromGr gsub glyphStore LocalizedForm.TRK
 
 	# VIT