Service startup/shutdown improvements