Fixes for dealing with disk on multiple node creation/destruction.