Resolves issues in cfour and qchem templates