Systemd cleanups

These two patches are just systemd-related cleanups.