Various chroot fixes