Some fixes to NodeContainingKey