diff --git a/containerregistry/resource-manager/v2019_06_01_preview/pom.xml b/containerregistry/resource-manager/v2019_06_01_preview/pom.xml
index 3c7e9344faaf..7ec93b5751e4 100644
--- a/containerregistry/resource-manager/v2019_06_01_preview/pom.xml
+++ b/containerregistry/resource-manager/v2019_06_01_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.1.0</version>
-        <relativePath>../../../pom.management.xml</relativePath>
+        <version>0.0.3-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerregistry</artifactId>
     <version>1.0.0-beta</version>
@@ -71,8 +71,6 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
-            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/containerregistry/resource-manager/v2019_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_06_01_preview/implementation/RunsImpl.java b/containerregistry/resource-manager/v2019_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_06_01_preview/implementation/RunsImpl.java
index 48890a261086..be070d16d75a 100644
--- a/containerregistry/resource-manager/v2019_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_06_01_preview/implementation/RunsImpl.java
+++ b/containerregistry/resource-manager/v2019_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_06_01_preview/implementation/RunsImpl.java
@@ -74,14 +74,10 @@ public Run call(RunInner inner) {
     public Observable<Run> getAsync(String resourceGroupName, String registryName, String runId) {
         RunsInner client = this.inner();
         return client.getAsync(resourceGroupName, registryName, runId)
-        .flatMap(new Func1<RunInner, Observable<Run>>() {
+        .map(new Func1<RunInner, Run>() {
             @Override
-            public Observable<Run> call(RunInner inner) {
-                if (inner == null) {
-                    return Observable.empty();
-                } else {
-                    return Observable.just((Run)wrapModel(inner));
-                }
+            public Run call(RunInner inner) {
+                return wrapModel(inner);
             }
        });
     }
diff --git a/containerregistry/resource-manager/v2019_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_06_01_preview/implementation/TasksImpl.java b/containerregistry/resource-manager/v2019_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_06_01_preview/implementation/TasksImpl.java
index 10a2d8781995..d8ca2fd2f9a2 100644
--- a/containerregistry/resource-manager/v2019_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_06_01_preview/implementation/TasksImpl.java
+++ b/containerregistry/resource-manager/v2019_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2019_06_01_preview/implementation/TasksImpl.java
@@ -76,14 +76,10 @@ public Task call(TaskInner inner) {
     public Observable<Task> getAsync(String resourceGroupName, String registryName, String taskName) {
         TasksInner client = this.inner();
         return client.getAsync(resourceGroupName, registryName, taskName)
-        .flatMap(new Func1<TaskInner, Observable<Task>>() {
+        .map(new Func1<TaskInner, Task>() {
             @Override
-            public Observable<Task> call(TaskInner inner) {
-                if (inner == null) {
-                    return Observable.empty();
-                } else {
-                    return Observable.just((Task)wrapModel(inner));
-                }
+            public Task call(TaskInner inner) {
+                return wrapModel(inner);
             }
        });
     }