Open/close fixes