Some updates to the NN selector.