diff --git a/src/estonian/ExtendEst.gf b/src/estonian/ExtendEst.gf
index 08712dc2..96740879 100644
--- a/src/estonian/ExtendEst.gf
+++ b/src/estonian/ExtendEst.gf
@@ -353,7 +353,7 @@ concrete ExtendEst of Extend =
 
     -- : VPSlash -> AP ;    -- täna leitud
     PastPartAP vp = {
-      s = \\_,_ => vp2adv (lin VP vp) <True : Bool> <PastPart Pass : VForm> ;
+      s = \\_,_ => vp2adv <lin VP vp : VP> True (PastPart Pass) ;
       infl = Invariable
       } ;
 
@@ -366,7 +366,7 @@ concrete ExtendEst of Extend =
     -- : VPSlash -> NP -> AP    -- hobisukeldujate poolt leitud (süvaveepomm)
     PastPartAgentAP vp np = {
       s = \\_,_ => appCompl True Pos by8agent_Prep np
-                ++ vp2adv (lin VP vp) <True : Bool> <PastPart Pass : VForm> ;
+                ++ vp2adv <lin VP vp : VP> True (PastPart Pass) ;
       infl = Invariable
       } ;
 
diff --git a/src/swahili/ParadigmsSwa.gf b/src/swahili/ParadigmsSwa.gf
index 5e485381..193fdb9a 100644
--- a/src/swahili/ParadigmsSwa.gf
+++ b/src/swahili/ParadigmsSwa.gf
@@ -388,7 +388,7 @@ mkN2 = overload {
   } ;
 
   
-  regV=\v -> lin V (MorphoSwa.regV v) ;
+  regV : Str -> V = \v -> lin V (MorphoSwa.regV v) ;
 
   mkV = overload {
     mkV : Str -> V = \v ->lin V(regV v) ;