Fix suggested changes from recent nab meeting