More chroot fixes