Ensure all handles are closed

And stop repeating the adv definition