Further fixes for save modals.