More fixes to run_nwchem