yet more systemd fixes