More work on the chroot build