Attempted fixes to merged patches not autoclosing