A few chroot fixes