Added logic to better handle restarting services when vip jumps