Further systemd enhancements

A bit more of systemd-related changes.