A couple of small fixes to make neighbor list for fields work