Fixing bugs in systemd unit generation