Fixes for latest names_and_entities.pig script