Fixes for 'unpack chroot'