diff --git a/input/fsh/Aliases.fsh b/input/fsh/Aliases.fsh
index d59ea1415..583dd2f4d 100644
--- a/input/fsh/Aliases.fsh
+++ b/input/fsh/Aliases.fsh
@@ -1,4 +1,5 @@
 Alias: $SGActor = http://smart.who.int/base/StructureDefinition/SGActor
+
 Alias: $SGTransactionOp = http://smart.who.int/base/StructureDefinition/SGTransactionOperation
 Alias: $SGTransactionDef = http://smart.who.int/base/StructureDefinition/SGTransactionDefinition
 
diff --git a/input/fsh/actors/Credential.Holder.fsh b/input/fsh/actors/Credential.Holder.fsh
index c5439da97..42ac6b5d0 100644
--- a/input/fsh/actors/Credential.Holder.fsh
+++ b/input/fsh/actors/Credential.Holder.fsh
@@ -1,14 +1,13 @@
-Alias: $SGActor = http://smart.who.int/base/StructureDefinition/SGActor
-
 Instance: Credential.Holder
 InstanceOf: $SGActor
+
 Usage: #example
 * meta.profile = "http://smart.who.int/smart-base/StructureDefinition/SGPersona"
 * type = #system
 * status = #draft
-* identifier.value = "TNP"
+* identifier.value = "Credential.Holder"
 * name = "Credential.Holder"
 * title = "Credential.Holder"
 * experimental = false
 * description = "Credential Holder"
-* extension[code] = $TrustActor#credential-holder
\ No newline at end of file
+* extension[code].valueCoding = $TrustActor#credential-holder
\ No newline at end of file
diff --git a/input/fsh/actors/Credential.Issuer.fsh b/input/fsh/actors/Credential.Issuer.fsh
index 2bedbbc24..3ff69af27 100644
--- a/input/fsh/actors/Credential.Issuer.fsh
+++ b/input/fsh/actors/Credential.Issuer.fsh
@@ -1,14 +1,12 @@
-Alias: $SGActor = http://smart.who.int/base/StructureDefinition/SGActor
-
 Instance: Credential.Issuer
 InstanceOf: $SGActor
 Usage: #example
 * meta.profile = "http://smart.who.int/smart-base/StructureDefinition/SGPersona"
 * type = #system
 * status = #draft
-* identifier.value = "TNP"
+* identifier.value = "Credential.Issuer"
 * name = "Credential.Issuer"
 * title = "Credential.Issuer"
 * experimental = false
 * description = "Credential Issuer"
-* extension[code] = $TrustActor#credential-issuer
\ No newline at end of file
+* extension[code].valueCoding = $TrustActor#credential-issuer
\ No newline at end of file
diff --git a/input/fsh/actors/GDHCN.fsh b/input/fsh/actors/GDHCN.fsh
index 352cc591e..b111cb5bb 100644
--- a/input/fsh/actors/GDHCN.fsh
+++ b/input/fsh/actors/GDHCN.fsh
@@ -1,5 +1,3 @@
-Alias: $SGActor = http://smart.who.int/base/StructureDefinition/SGActor
-
 Instance: GDHCN
 InstanceOf: $SGActor
 Usage: #example
@@ -11,4 +9,4 @@ Usage: #example
 * title = "GDHCN"
 * experimental = false
 * description = "WHO Global Digital Health Certification Network"
-* extension[code] = $TrustActor#GDHCN
\ No newline at end of file
+* extension[code].valueCoding = $TrustActor#GDHCN
\ No newline at end of file
diff --git a/input/fsh/actors/TNG.fsh b/input/fsh/actors/TNG.fsh
index 552df88a4..f43d7d1cc 100644
--- a/input/fsh/actors/TNG.fsh
+++ b/input/fsh/actors/TNG.fsh
@@ -1,5 +1,3 @@
-Alias: $SGActor = http://smart.who.int/base/StructureDefinition/SGActor
-
 Instance: TNG
 InstanceOf: $SGActor
 Usage: #example
@@ -11,4 +9,4 @@ Usage: #example
 * title = "TNG"
 * experimental = false
 * description = "Trust Network Gateway"
-* extension[code] = $TrustActor#TNG
\ No newline at end of file
+* extension[code].valueCoding = $TrustActor#TNG
\ No newline at end of file
diff --git a/input/fsh/actors/TNP.fsh b/input/fsh/actors/TNP.fsh
index be42b14be..a7a03e8be 100644
--- a/input/fsh/actors/TNP.fsh
+++ b/input/fsh/actors/TNP.fsh
@@ -1,5 +1,3 @@
-Alias: $SGActor = http://smart.who.int/base/StructureDefinition/SGActor
-
 Instance: TNP
 InstanceOf: $SGActor
 Usage: #example
@@ -11,4 +9,4 @@ Usage: #example
 * title = "TNP"
 * experimental = false
 * description = "Trust Network Participant"
-* extension[code] = $TrustActor#TNP
\ No newline at end of file
+* extension[code].valueCoding = $TrustActor#TNP
\ No newline at end of file
diff --git a/sushi-config.yaml b/sushi-config.yaml
index 1cb6739a8..27ed5ffbb 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -23,11 +23,11 @@ email: tng-support@who.int
 jurisdiction: http://unstats.un.org/unsd/methods/m49/m49.htm#001
 # experimental: true
 dependencies:
-    hl7.fhir.uv.ips: 1.1.0
+#    hl7.fhir.uv.ips: 1.1.0
 #    fhir.who.ddcc: 1.0.0
 #    who.ddcc: current
-    who.base: dev
-    who.ddcc: dev
+    who.base: current
+    who.ddcc: current
 
 pages:
   index.xml: