[NDS] Added minor improvments.