Fix bug in checks, add check for disk