bunch of fixes for incremental plans during reconfiguration