diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainerImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainerImpl.java
index f9f40be2b2c3b..952e25507a6e0 100644
--- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainerImpl.java
+++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainerImpl.java
@@ -74,8 +74,7 @@ public Mono<BlobContainer> updateResourceAsync() {
 
     @Override
     protected Mono<BlobContainerInner> getInnerAsync() {
-        BlobContainersInner client = this.manager().inner().blobContainers();
-        return null; // NOP getInnerAsync implementation as get is not supported
+        return this.manager().inner().blobContainers().getAsync(resourceGroupName, accountName, containerName);
     }
 
     @Override
diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainersImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainersImpl.java
index 76e9a7ce68d35..0023cae37e474 100644
--- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainersImpl.java
+++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainersImpl.java
@@ -54,7 +54,7 @@ private ImmutabilityPolicyImpl wrapImmutabilityPolicyModel(ImmutabilityPolicyInn
         return new ImmutabilityPolicyImpl(inner, manager());
     }
 
-    private Mono<ImmutabilityPolicyInner> getImmutabilityPolicyInnerUsingBlobContainersInnerAsync(String id) {
+    public Mono<ImmutabilityPolicyInner> getImmutabilityPolicyInnerUsingBlobContainersInnerAsync(String id) {
         String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
         String accountName = IdParsingUtils.getValueFromIdByName(id, "storageAccounts");
         String containerName = IdParsingUtils.getValueFromIdByName(id, "containers");
@@ -73,7 +73,7 @@ public Mono<BlobContainer> getAsync(String resourceGroupName, String accountName
         BlobContainersInner client = this.inner();
         return client
             .getAsync(resourceGroupName, accountName, containerName)
-            .map(inner -> new BlobContainerImpl(inner, manager()));
+            .map(this::wrapBlobContainerModel);
     }
 
     @Override
@@ -106,7 +106,7 @@ public Mono<ImmutabilityPolicy> getImmutabilityPolicyAsync(
         BlobContainersInner client = this.inner();
         return client
             .getImmutabilityPolicyAsync(resourceGroupName, accountName, containerName)
-            .map(inner -> wrapImmutabilityPolicyModel(inner));
+            .map(this::wrapImmutabilityPolicyModel);
     }
 
     @Override
diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/IdParsingUtils.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/IdParsingUtils.java
index 9182d58545f31..d6596e373a0f5 100644
--- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/IdParsingUtils.java
+++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/IdParsingUtils.java
@@ -23,7 +23,7 @@ public static String getValueFromIdByName(String id, String name) {
         Iterator<String> itr = iterable.iterator();
         while (itr.hasNext()) {
             String part = itr.next();
-            if (part != null && part.trim() != "") {
+            if (part != null && !part.trim().equals("")) {
                 if (part.equalsIgnoreCase(name)) {
                     if (itr.hasNext()) {
                         return itr.next();
@@ -52,7 +52,7 @@ public static String getValueFromIdByPosition(String id, int pos) {
         int index = 0;
         while (itr.hasNext()) {
             String part = itr.next();
-            if (part != null && part.trim() != "") {
+            if (part != null && !part.trim().equals("")) {
                 if (index == pos) {
                     if (itr.hasNext()) {
                         return itr.next();
diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/PolicyRuleImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/PolicyRuleImpl.java
index 369890f0e7cdd..e73832a32c1f9 100644
--- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/PolicyRuleImpl.java
+++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/PolicyRuleImpl.java
@@ -175,7 +175,7 @@ public PolicyRuleImpl withBlobTypeToFilterFor(BlobTypes blobType) {
         if (blobTypesToFilterFor == null) {
             blobTypesToFilterFor = new ArrayList<>();
         }
-        if (blobTypesToFilterFor.contains(blobType)) {
+        if (blobTypesToFilterFor.contains(blobType.toString())) {
             return this;
         }
         blobTypesToFilterFor.add(blobType.toString());
@@ -262,9 +262,6 @@ public PolicyRuleImpl withDeleteActionOnBaseBlob(float daysAfterBaseBlobModifica
     @Override
     public PolicyRuleImpl withDeleteActionOnSnapShot(float daysAfterSnapShotCreationUntilDeleting) {
         ManagementPolicySnapShot currentSnapShot = new ManagementPolicySnapShot();
-        if (currentSnapShot == null) {
-            currentSnapShot = new ManagementPolicySnapShot();
-        }
         currentSnapShot
             .withDelete(
                 new DateAfterCreation().withDaysAfterCreationGreaterThan(daysAfterSnapShotCreationUntilDeleting));
diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageNetworkRulesHelper.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageNetworkRulesHelper.java
index 429e7a2b696e2..2d8e3ba9516b0 100644
--- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageNetworkRulesHelper.java
+++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageNetworkRulesHelper.java
@@ -15,12 +15,13 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.TreeSet;
 
-/** Helper to operate on storage account NetworkRule set {@link StorageAccountInner#getNetworkRuleSet} property. */
+/** Helper to operate on storage account NetworkRule set {@link StorageAccountInner#networkRuleSet()} property. */
 final class StorageNetworkRulesHelper {
-    private static final String BYPASS_NONE_STR = Bypass.NONE.toString().toLowerCase();
+    private static final String BYPASS_NONE_STR = Bypass.NONE.toString().toLowerCase(Locale.ROOT);
     private final boolean isInCreateMode;
     private final StorageAccountInner inner;
     private final StorageAccountCreateParameters createParameters;
@@ -129,7 +130,7 @@ static boolean canReadLogEntriesFromAnyNetwork(final StorageAccountInner inner)
             && inner.networkRuleSet().defaultAction() != null
             && inner.networkRuleSet().defaultAction().equals(DefaultAction.DENY)) {
             Set<String> bypassSet = parseBypass(inner.networkRuleSet().bypass());
-            return bypassSet.contains(Bypass.LOGGING.toString().toLowerCase());
+            return bypassSet.contains(Bypass.LOGGING.toString().toLowerCase(Locale.ROOT));
         }
         return true;
     }
@@ -145,7 +146,7 @@ static boolean canReadMetricsFromAnyNetwork(final StorageAccountInner inner) {
             && inner.networkRuleSet().defaultAction() != null
             && inner.networkRuleSet().defaultAction().equals(DefaultAction.DENY)) {
             Set<String> bypassSet = parseBypass(inner.networkRuleSet().bypass());
-            return bypassSet.contains(Bypass.METRICS.toString().toLowerCase());
+            return bypassSet.contains(Bypass.METRICS.toString().toLowerCase(Locale.ROOT));
         }
         return true;
     }
@@ -161,7 +162,7 @@ static boolean canAccessFromAzureServices(final StorageAccountInner inner) {
             && inner.networkRuleSet().defaultAction() != null
             && inner.networkRuleSet().defaultAction().equals(DefaultAction.DENY)) {
             Set<String> bypassSet = parseBypass(inner.networkRuleSet().bypass());
-            return bypassSet.contains(Bypass.AZURE_SERVICES.toString().toLowerCase());
+            return bypassSet.contains(Bypass.AZURE_SERVICES.toString().toLowerCase(Locale.ROOT));
         }
         return true;
     }
@@ -350,7 +351,7 @@ StorageNetworkRulesHelper withoutAccessFromAzureServices() {
      */
     private void addToBypassList(Bypass bypass) {
         NetworkRuleSet networkRuleSet = this.getNetworkRuleSetConfig(true);
-        final String bypassStr = bypass.toString().toLowerCase();
+        final String bypassStr = bypass.toString().toLowerCase(Locale.ROOT);
         Set<String> bypassSet = parseBypass(networkRuleSet.bypass());
         if (bypassStr.equalsIgnoreCase(BYPASS_NONE_STR)) {
             bypassSet.clear();
@@ -375,7 +376,7 @@ private void removeFromBypassList(Bypass bypass) {
             return;
         } else {
             Set<String> bypassSet = parseBypass(networkRuleSet.bypass());
-            String bypassStr = bypass.toString().toLowerCase();
+            String bypassStr = bypass.toString().toLowerCase(Locale.ROOT);
             if (bypassSet.contains(bypassStr)) {
                 bypassSet.remove(bypassStr);
             }
@@ -387,7 +388,7 @@ private void removeFromBypassList(Bypass bypass) {
     }
 
     /**
-     * The {@link NetworkRuleSet#getDefaultAction()} is a required property.
+     * The {@link NetworkRuleSet#defaultAction()} is a required property.
      *
      * <p>During create mode, this method sets the default action to DENY if it is already not set by the user and user
      * specifies at least one network rule or choose at least one exception.
@@ -590,7 +591,7 @@ private static Set<String> parseBypass(Bypass bypass) {
             Set<String> bypassSet = new TreeSet<>();
             List<String> bypassStrList = Arrays.asList(bypass.toString().split(","));
             for (String s : bypassStrList) {
-                s = s.trim().toLowerCase();
+                s = s.trim().toLowerCase(Locale.ROOT);
                 if (!s.isEmpty() && !bypassSet.contains(s)) {
                     bypassSet.add(s);
                 }
diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageSkusImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageSkusImpl.java
index a6af2d8afce48..3e15c95c30f05 100644
--- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageSkusImpl.java
+++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageSkusImpl.java
@@ -35,6 +35,6 @@ public PagedFlux<StorageSku> listAsync() {
 
     @Override
     public SkusInner inner() {
-        return this.inner();
+        return manager.inner().skus();
     }
 }