A first look at confining systemd

Various bug fixes and clean-ups