diff --git a/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml b/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml
index 20f70fe3a30fdc3de6b9a86b1caf56d2f71d3cfd..781b88346bddb0c5e098c5046160e008f191643d 100644
--- a/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml
+++ b/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml
@@ -129,6 +129,7 @@ definitions:
   PerceivedSeverityRequest:
     description: >
       This type represents the escalated value of the perceived severity for an alarm.
+    type: object
     required:
       - proposedPerceivedSeverity
     properties:
diff --git a/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml b/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml
index ff51d394ea6aec7783422cbb36431a99d791b1f0..0b82df5cf9493b0b536a92457369a0b1556b056a 100644
--- a/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml
+++ b/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml
@@ -128,6 +128,7 @@ definitions:
           Specifies VNFMs compatible with the VNF. This information is copied from the VNFD.
           ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on
           TOSCA specifications.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String"
       userDefinedData:
         description: >
           User defined data for the VNF package.
diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml
index a21e26f8c0041fca4038d2cf9d1040cac4fc33e7..7b1cb509d98acfad443af103264d9d775ce4d7ca 100644
--- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml
+++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml
@@ -933,6 +933,7 @@ definitions:
     description: >
       This type describes the protocol layer(s) that a CP uses together with
       protocol-related information, like addresses.
+    type: object
     required:
       - layerProtocol
     properties:
diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/definitions/SOL002SOL003_def.yaml
index ed16602e50f327e6552fd841ca24af02ef86fa34..aaa54aac03ae59ee6ed9f60645acb9d9f7eb57bc 100644
--- a/src/definitions/SOL002SOL003_def.yaml
+++ b/src/definitions/SOL002SOL003_def.yaml
@@ -195,7 +195,7 @@ definitions:
         items:
           type: string
 
-  VimConnectionInfo:
+  VnfExtCpData.VimConnectionInfo:
     description: >
       This type represents parameters to connect to a VIM for managing the
       resources of a VNF instance.
@@ -586,7 +586,7 @@ definitions:
     type: object
     required:
       - id
-      - virtualLinkDescId
+      - vnfVirtualLinkDescId
       - resourceId
     properties:
       id: