diff --git a/src/front-door/azext_front_door/_validators.py b/src/front-door/azext_front_door/_validators.py
index b95fe9aa9fa..be59b69b65d 100644
--- a/src/front-door/azext_front_door/_validators.py
+++ b/src/front-door/azext_front_door/_validators.py
@@ -12,7 +12,7 @@ def get_name_or_id_validator(dest, child_type=None, resource_type='Frontdoors',
     def _validate_name_or_id(cmd, namespace):
 
         from azure.cli.core.commands.client_factory import get_subscription_id
-        from msrestazure.tools import is_valid_resource_id, resource_id
+        from azure.mgmt.core.tools import is_valid_resource_id, resource_id
 
         subscription_id = get_subscription_id(cmd.cli_ctx)
         resource_group = namespace.resource_group_name
diff --git a/src/front-door/azext_front_door/custom.py b/src/front-door/azext_front_door/custom.py
index f1739c31ecd..471122be2f8 100644
--- a/src/front-door/azext_front_door/custom.py
+++ b/src/front-door/azext_front_door/custom.py
@@ -4,7 +4,7 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-# pylint: disable=too-many-lines disable=line-too-long useless-object-inheritance condition-evals-to-constant
+# pylint: disable=too-many-lines line-too-long useless-object-inheritance condition-evals-to-constant too-many-positional-arguments
 
 import sys
 from azure.cli.core.commands import cached_get, cached_put
@@ -135,7 +135,7 @@ def delete_func(cmd, resource_group_name, resource_name, item_name, no_wait=Fals
 # region Frontdoor
 def _front_door_subresource_id(cmd, resource_group, front_door_name, child_type, child_name):
     from azure.cli.core.commands.client_factory import get_subscription_id
-    from msrestazure.tools import resource_id
+    from azure.mgmt.core.tools import resource_id
 
     subscription_id = get_subscription_id(cmd.cli_ctx)
 
@@ -661,6 +661,7 @@ def create_fd_routing_rules(cmd, resource_group_name, front_door_name, item_name
                               redirect_protocol, custom_host, custom_path,
                               custom_fragment, custom_query_string)
 
+    rule = None
     if route_type == 'Forward':
         rule = RoutingRule(
             name=item_name,