Bug fixes and NLS updates.