Minor tweaks to NBTA