[FOLD] Fixes and changes to 'keep SHAMapNodes' based on code review