Other changes needed for git diskimage-builder