Temporary fixes for neighbor-lists distributed runs, still need to investigate