A few more tweaks to setting the default queue and service restarting