FIX make tools/nsplist work again