fixes for pairlist and NA