Fixes for systemd 215

I see. Thanks again.