Disk check fixes