Move auto-close disabling further down to only modify instances