diff --git a/src/rockstor/scripts/scheduled_tasks/reboot_shutdown.py b/src/rockstor/scripts/scheduled_tasks/reboot_shutdown.py
index 379e29dde..ff99be987 100644
--- a/src/rockstor/scripts/scheduled_tasks/reboot_shutdown.py
+++ b/src/rockstor/scripts/scheduled_tasks/reboot_shutdown.py
@@ -18,7 +18,7 @@
 import sys
 import json
 from datetime import datetime, timedelta
-import crontabwindow  # load crontabwindow module
+from scripts.scheduled_tasks import crontabwindow
 from smart_manager.models import Task, TaskDefinition
 from cli.api_wrapper import APIWrapper
 from django.utils.timezone import utc
diff --git a/src/rockstor/smart_manager/agents/__init__.py b/src/rockstor/smart_manager/agents/__init__.py
index d6459dbba..c33c0ea5c 100644
--- a/src/rockstor/smart_manager/agents/__init__.py
+++ b/src/rockstor/smart_manager/agents/__init__.py
@@ -1,6 +1,6 @@
-from nfsd_calls import (
+from smart_manager.agents.nfsd_calls import (
     process_nfsd_calls,
-    share_distribution,  # noqa E501
+    share_distribution,
     share_client_distribution,
     nfs_uid_gid_distribution,
-)  # noqa E501
+)