Service manager tweaks