More tweaks to nac-lstd