Fixes for remove/add nodes