Fixes for systemd 215