Updated to use latest from lfetool.