Odd locking issues, reverting auto-close