fix bugs reported from NLP machines.