Updates to scripts to fix errors with new nn+ update