A couple of bug fixes: test cases pass with the new packed node management model