diff --git a/onvif/Makefile.old b/onvif/Makefile.old
index 37dce3ef7..cdcfbf31d 100644
--- a/onvif/Makefile.old
+++ b/onvif/Makefile.old
@@ -20,11 +20,13 @@
 # ==========================================================================
 
 proxy:
-	wsdl2perl.pl -p ONVIF::Device:: -b proxy file:wsdl/devicemgmt.wsdl
-	wsdl2perl.pl -p ONVIF::Media:: -b proxy file:wsdl/media.wsdl
-	wsdl2perl.pl -p ONVIF::PTZ:: -b proxy file:wsdl/ptz.wsdl
-	wsdl2perl.pl -p ONVIF::Event:: -b proxy file:wsdl/event.wsdl
-#	wsdl2perl.pl -p WSDiscovery:: -b proxy file:wsdl/wsdiscovery-udp.wsdl
+#	wsdl2perl.pl -p ONVIF::Device:: -b proxy/lib file:wsdl/devicemgmt.wsdl
+#	wsdl2perl.pl -p ONVIF::Media:: -b proxy/lib file:wsdl/media.wsdl
+#	wsdl2perl.pl -p ONVIF::PTZ:: -b proxy/lib file:wsdl/ptz.wsdl
+#	wsdl2perl.pl -p ONVIF::Event:: -b proxy/lib file:wsdl/event.wsdl
+# wsdl2perl.pl -p ONVIF::Analytics:: -b proxy/lib file:wsdl/analytics.wsdl
+#	wsdl2perl.pl -p WSDiscovery:: -b proxy/lib file:wsdl/wsdiscovery-udp.wsdl
+# wsdl2perl.pl -p WSNotification:: -b proxy/lib file:wsdl/wsnotification.wsdl
 
 clean:
 	rm -rf proxy/*
diff --git a/onvif/wsdl/b-2.xsd b/onvif/wsdl/b-2.xsd
index 8740d2d49..906f8fe09 100644
--- a/onvif/wsdl/b-2.xsd
+++ b/onvif/wsdl/b-2.xsd
@@ -31,10 +31,10 @@ This document and the information contained herein is provided on an "AS IS" bas
   />
 
   <xsd:import namespace="http://docs.oasis-open.org/wsrf/bf-2"
-              schemaLocation="http://docs.oasis-open.org/wsrf/bf-2.xsd" 
-  />
+              schemaLocation="file:wsdl/bf-2.xsd"/>
+<!--              schemaLocation="http://docs.oasis-open.org/wsrf/bf-2.xsd"  /> -->
   <xsd:import namespace="http://docs.oasis-open.org/wsn/t-1"
-              schemaLocation="file:t-1.xsd" 
+              schemaLocation="file:wsdl/t-1.xsd" 
   />
   
 <!-- ===================== Misc. Helper Types ===================== -->
diff --git a/onvif/wsdl/bf-2.xsd b/onvif/wsdl/bf-2.xsd
index 578ad30bb..4efefea72 100644
--- a/onvif/wsdl/bf-2.xsd
+++ b/onvif/wsdl/bf-2.xsd
@@ -66,7 +66,8 @@ This document and the information contained herein is provided on an "AS IS" bas
         <xsd:complexType>
           <xsd:simpleContent>
             <xsd:extension base="xsd:string">
-              <xsd:attribute ref="xml:lang" use="optional"/>
+              <xsd:attribute ref="xml:lang" use="optional"/> 
+        <!--      <xsd:anyAttribute processContents="lax" />-->
             </xsd:extension>
           </xsd:simpleContent>
         </xsd:complexType>
diff --git a/onvif/wsdl/t-1.xsd b/onvif/wsdl/t-1.xsd
index 191de22d7..ae42cfbc7 100644
--- a/onvif/wsdl/t-1.xsd
+++ b/onvif/wsdl/t-1.xsd
@@ -94,13 +94,14 @@ This document and the information contained herein is provided on an "AS IS" bas
           <xsd:element name="MessagePattern" 
                        type="wstop:QueryExpressionType" 
                        minOccurs="0" maxOccurs="1" />
-          <xsd:element name="Topic" type="wstop:TopicType" 
-                       minOccurs="0" maxOccurs="unbounded">
+              <xsd:any minOccurs="0"/>
+<!--          <xsd:element name="Topic" type="wstop:TopicType" 
+                       minOccurs="0" maxOccurs="unbounded"> 
             <xsd:unique name="childTopicUniqueness">
               <xsd:selector xpath="wstop:topic"/>
               <xsd:field xpath="@name"/>
             </xsd:unique>
-          </xsd:element>
+          </xsd:element> -->
           <xsd:any namespace="##other" minOccurs="0" 
                                        maxOccurs="unbounded"/>
         </xsd:sequence>
diff --git a/onvif/wsdl/wsdl.xsd b/onvif/wsdl/wsdl.xsd
index b69c377e2..a81ab5691 100644
--- a/onvif/wsdl/wsdl.xsd
+++ b/onvif/wsdl/wsdl.xsd
@@ -112,18 +112,22 @@ No other rights are granted by implication, estoppel or otherwise.
       <xs:element name="import" type="wsdl:tImport" />
       <xs:element name="types" type="wsdl:tTypes" />                     
       <xs:element name="message"  type="wsdl:tMessage" >
+<!--
         <xs:unique name="part" >
           <xs:selector xpath="wsdl:part" />
           <xs:field xpath="@name" />
         </xs:unique>
+-->
       </xs:element>
       <xs:element name="portType" type="wsdl:tPortType" />
       <xs:element name="binding"  type="wsdl:tBinding" />
       <xs:element name="service"  type="wsdl:tService" >
+<!--
         <xs:unique name="port" >
           <xs:selector xpath="wsdl:port" />
           <xs:field xpath="@name" />
         </xs:unique>
+-->
 	  </xs:element>
     </xs:choice>
   </xs:group>
@@ -307,4 +311,4 @@ No other rights are granted by implication, estoppel or otherwise.
     <xs:attribute ref="wsdl:required" use="optional" />
   </xs:complexType>
 
-</xs:schema>
\ No newline at end of file
+</xs:schema>