[PATCH] Fix bz1064991 and closer systemd integration