Minor systemd fixes