Some more tweaks to startup as a service