Modal close fixes