Small NWA fixes.