Fix systemd integration issues