examples/systemd/vdo.service         | 1 +
 utils/uds/Makefile                   | 2 +-
 utils/vdo/base/Makefile              | 2 +-
 utils/vdo/user/Makefile              | 2 +-
 vdo-manager/vdomgmnt/VDOOperation.py | 1 -
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/systemd/vdo.service b/examples/systemd/vdo.service
index 11459ab..46a38fa 100644
--- a/examples/systemd/vdo.service
+++ b/examples/systemd/vdo.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=VDO volume services
 After=systemd-remount-fs.service
+After=multipathd.service iscsi.service iscsid.service
 
 [Service]
 Type=oneshot
diff --git a/utils/uds/Makefile b/utils/uds/Makefile
index e33d682..4e5652b 100644
--- a/utils/uds/Makefile
+++ b/utils/uds/Makefile
@@ -55,7 +55,7 @@ C_WARNS =	-Wbad-function-cast		\
 		-Wold-style-definition		\
 		-Wswitch-default
 
-OPT_FLAGS      = -O3 -fno-omit-frame-pointer
+OPT_FLAGS      = -fno-omit-frame-pointer
 DEBUG_FLAGS    =
 RPM_OPT_FLAGS ?= -fpic
 GLOBAL_FLAGS   = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -g $(OPT_FLAGS)		\
diff --git a/utils/vdo/base/Makefile b/utils/vdo/base/Makefile
index 8f5b004..4edb102 100644
--- a/utils/vdo/base/Makefile
+++ b/utils/vdo/base/Makefile
@@ -47,7 +47,7 @@ C_WARNS          =				\
 		   -Wold-style-definition	\
 		   -Wswitch-default		\
 
-OPT_FLAGS	 = -O3 -fno-omit-frame-pointer
+OPT_FLAGS	 = -fno-omit-frame-pointer
 DEBUG_FLAGS      =
 RPM_OPT_FLAGS   ?= -fpic
 GLOBAL_FLAGS     = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -g $(OPT_FLAGS) $(WARNS) \
diff --git a/utils/vdo/user/Makefile b/utils/vdo/user/Makefile
index 9f9b318..4b6889b 100644
--- a/utils/vdo/user/Makefile
+++ b/utils/vdo/user/Makefile
@@ -49,7 +49,7 @@ C_WARNS          =				\
 		   -Wold-style-definition	\
 		   -Wswitch-default		\
 
-OPT_FLAGS	 = -O3 -fno-omit-frame-pointer
+OPT_FLAGS	 = -fno-omit-frame-pointer
 DEBUG_FLAGS      =
 RPM_OPT_FLAGS   ?= -fpic
 GLOBAL_FLAGS     = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -g $(OPT_FLAGS) 	\
diff --git a/vdo-manager/vdomgmnt/VDOOperation.py b/vdo-manager/vdomgmnt/VDOOperation.py
index 6988137..92ef01e 100644
--- a/vdo-manager/vdomgmnt/VDOOperation.py
+++ b/vdo-manager/vdomgmnt/VDOOperation.py
@@ -41,7 +41,6 @@ from vdo.utils import Transaction, transactional
 from functools import partial
 import inspect
 import logging
-import __main__ as main
 import os
 import re
 import sys