Makefile fixes for systemctl systems