more systemd related fixes