Fixes for systemd/boot