Misc updates/fixes

Depends on https://github.com/coreos/scripts/pull/301