Don't eat up threads
Fix case-sensitivity issue